Fixes improper error generation by DeleteShader

TRAC #11662 Signed-off-by: Nicolas Capens Signed-off-by: Daniel Koch Author: Shannon Woods git-svn-id: https://angleproject.googlecode.com/svn/trunk@134 736b8ea6-26fd-11df-bfd4-992fa37f6226

Fixes improper error generation by DeleteShader
75401e61 · daniel@transgaming.com · 0cefaf45 · 75401e61
Commit 75401e61 authored Apr 13, 2010 by daniel@transgaming.com
Hide whitespace changes
Inline Side-by-side

Showing with 34 additions and 0 deletions

libGLESv2.cpp src/libGLESv2/libGLESv2.cpp +34 -0

No files found.
--- a/src/libGLESv2/libGLESv2.cpp
+++ b/src/libGLESv2/libGLESv2.cpp
@@ -1104,10 +1104,27 @@ void __stdcall glDeleteProgram(GLuint program)
    try
    {
+        if (program == 0)
+        {
+            return;
+        }
        gl::Context *context = gl::getContext();
        if (context)
        {
+            if (!context->getProgram(program))
+            {
+                if(context->getShader(program))
+                {
+                    return error(GL_INVALID_OPERATION);
+                }
+                else
+                {
+                    return error(GL_INVALID_VALUE);
+                }
+            }
            context->deleteProgram(program);
        }
    }
@@ -1150,10 +1167,27 @@ void __stdcall glDeleteShader(GLuint shader)
    try
    {
+        if (shader == 0)
+        {
+            return;
+        }
        gl::Context *context = gl::getContext();
        if (context)
        {
+            if (!context->getShader(shader))
+            {
+                if(context->getProgram(shader))
+                {
+                    return error(GL_INVALID_OPERATION);
+                }
+                else
+                {
+                    return error(GL_INVALID_VALUE);
+                }
+            }
            context->deleteShader(shader);
        }
    }