[INTERNAL] Added samper objects

diff --git a/src/coregl_export_gl.c b/src/coregl_export_gl.c
index f67b9c5..0c19820 100644 (file)
--- a/src/coregl_export_gl.c
+++ b/src/coregl_export_gl.c
@@ -1328,15 +1328,15 @@ coregl_api_glGetBufferParameteri64v(GLenum target, GLenum pname, GLint64* params
 }
 
 void
-coregl_api_glGenSamplers(GLsizei count, GLuint* samplers)
+coregl_api_glGenSamplers(GLsizei n, GLuint* samplers)
 {
-       ovr_glGenSamplers(count, samplers);
+       ovr_glGenSamplers(n, samplers);
 }
 
 void
-coregl_api_glDeleteSamplers(GLsizei count, const GLuint* samplers)
+coregl_api_glDeleteSamplers(GLsizei n, const GLuint* samplers)
 {
-       ovr_glDeleteSamplers(count, samplers);
+       ovr_glDeleteSamplers(n, samplers);
 }
 
 GLboolean

diff --git a/src/headers/sym_gl.h b/src/headers/sym_gl.h
index 00bef8d..5094be1 100644 (file)
--- a/src/headers/sym_gl.h
+++ b/src/headers/sym_gl.h
@@ -253,8 +253,8 @@ _COREGL_SYMBOL(GL_FALSE, void, glGetInteger64v, (GLenum pname, GLint64* params))
 _COREGL_SYMBOL(GL_FALSE, void, glGetSynciv, (GLsync sync, GLenum pname, GLsizei bufSize, GLsizei* length, GLint* values))
 _COREGL_SYMBOL(GL_FALSE, void, glGetInteger64i_v, (GLenum target, GLuint index, GLint64* data))
 _COREGL_SYMBOL(GL_FALSE, void, glGetBufferParameteri64v, (GLenum target, GLenum pname, GLint64* params))
-_COREGL_SYMBOL(GL_FALSE, void, glGenSamplers, (GLsizei count, GLuint* samplers))
-_COREGL_SYMBOL(GL_FALSE, void, glDeleteSamplers, (GLsizei count, const GLuint* samplers))
+_COREGL_SYMBOL(GL_FALSE, void, glGenSamplers, (GLsizei n, GLuint* samplers))
+_COREGL_SYMBOL(GL_FALSE, void, glDeleteSamplers, (GLsizei n, const GLuint* samplers))
 _COREGL_SYMBOL(GL_FALSE, GLboolean, glIsSampler, (GLuint sampler))
 _COREGL_SYMBOL(GL_FALSE, void, glBindSampler, (GLuint unit, GLuint sampler))
 _COREGL_SYMBOL(GL_FALSE, void, glSamplerParameteri, (GLuint sampler, GLenum pname, GLint param))

diff --git a/src/modules/fastpath/coregl_fastpath.c b/src/modules/fastpath/coregl_fastpath.c
index f354f47..54ad6cf 100644 (file)
--- a/src/modules/fastpath/coregl_fastpath.c
+++ b/src/modules/fastpath/coregl_fastpath.c
@@ -450,13 +450,9 @@ fastpath_apply_overrides_gl(int enable)
                COREGL_OVERRIDE(fastpath_, glGetSamplerParameteriv);
                COREGL_OVERRIDE(fastpath_, glGetSamplerParameterfv);
                COREGL_OVERRIDE(fastpath_, glVertexAttribDivisor);
-               COREGL_OVERRIDE(fastpath_, glGetProgramBinary); // OPEN
-               COREGL_OVERRIDE(fastpath_, glProgramBinary); // OPEN
+               COREGL_OVERRIDE(fastpath_, glGetProgramBinary);
+               COREGL_OVERRIDE(fastpath_, glProgramBinary);
                COREGL_OVERRIDE(fastpath_, glProgramParameteri);
-               COREGL_OVERRIDE(fastpath_, glInvalidateSubFramebuffer);
-               COREGL_OVERRIDE(fastpath_, glTexStorage2D);
-               COREGL_OVERRIDE(fastpath_, glTexStorage3D);
-               COREGL_OVERRIDE(fastpath_, glGetInternalformativ);
 
        }
        else
@@ -1407,6 +1403,11 @@ fastpath_make_context_current(GLGlueContext *oldctx, GLGlueContext *newctx)
                                CHECK_GL_ERROR(_orig_fastpath_glBindBuffer(GL_ARRAY_BUFFER, 0))
                        }
 
+                       STATE_COMPARE(gl_vertex_array_divisor[i])
+                       {
+                               CHECK_GL_ERROR(_orig_fastpath_glVertexAttribDivisor(i, newctx->gl_vertex_array_divisor[i]))
+                       }
+
                        if (newctx->gl_vertex_array_pointer[i] != NULL)
                        {
                                CHECK_GL_ERROR(_orig_fastpath_glVertexAttribPointer(i,

diff --git a/src/modules/fastpath/coregl_fastpath_gl.c b/src/modules/fastpath/coregl_fastpath_gl.c
index aac2b00..643b00f 100644 (file)
--- a/src/modules/fastpath/coregl_fastpath_gl.c
+++ b/src/modules/fastpath/coregl_fastpath_gl.c
@@ -4398,31 +4398,7 @@ fastpath_glDeleteQueries(GLsizei n, const GLuint* ids)
                        objid_array[real_n++] = real_objid;
                }
 
-               IF_GL_SUCCESS(_orig_fastpath_glDeleteQueries(real_n, objid_array))
-               {
-                       /*
-                       for (i = 0; i < real_n; i++)
-                       {
-                               General_Trace_List *current = NULL;
-                               current = current_ctx->ostate.shared->using_gctxs;
-
-                               while (current != NULL)
-                               {
-                                       GLGlueContext *cur_gctx = (GLGlueContext *)current->value;
-
-                                       for (j = 0; j < cur_gctx->gl_num_tex_units[0]; j++)
-                                       {
-                                               if (cur_gctx->gl_tex_2d_state[j] == objid_array[i])
-                                                       cur_gctx->gl_tex_2d_state[j] = 0;
-                                               if (cur_gctx->gl_tex_cube_state[j] == objid_array[i])
-                                                       cur_gctx->gl_tex_cube_state[j] = 0;
-                                       }
-
-                                       current = current->next;
-                               }
-                       }
-                       */
-               }
+               _orig_fastpath_glDeleteQueries(real_n, objid_array);
        }
 
        goto finish;
@@ -4463,6 +4439,69 @@ finish:
 }
 
 
+// TODO : Begin Query without Gen
+void
+fastpath_glBeginQuery(GLenum target, GLuint id)
+{
+       GLuint real_obj;
+
+       DEFINE_FASTPAH_GL_FUNC();
+       _COREGL_FASTPATH_FUNC_BEGIN();
+       INIT_FASTPATH_GL_FUNC();
+
+       if (GET_REAL_OBJ(GL_OBJECT_TYPE_QUERY, id, &real_obj) != 1)
+       {
+               _set_gl_error(GL_OUT_OF_MEMORY);
+               goto finish;
+       }
+
+       IF_GL_SUCCESS(_orig_fastpath_glBeginQuery(target, real_obj))
+       {
+       }
+
+       goto finish;
+
+finish:
+       _COREGL_FASTPATH_FUNC_END();
+}
+
+void
+fastpath_glEndQuery(GLenum target)
+{
+       _COREGL_FASTPATH_FUNC_BEGIN();  SIGILL_ERROR(); // BLOCK API
+       _orig_fastpath_glEndQuery(target);
+
+       goto finish;
+
+finish:
+       _COREGL_FASTPATH_FUNC_END();
+}
+
+void
+fastpath_glGetQueryiv(GLenum target, GLenum pname, GLint* params)
+{
+       _COREGL_FASTPATH_FUNC_BEGIN();  SIGILL_ERROR(); // BLOCK API
+       _orig_fastpath_glGetQueryiv(target, pname, params);
+
+       goto finish;
+
+finish:
+       _COREGL_FASTPATH_FUNC_END();
+}
+
+void
+fastpath_glGetQueryObjectuiv(GLuint id, GLenum pname, GLuint* params)
+{
+       _COREGL_FASTPATH_FUNC_BEGIN();  SIGILL_ERROR(); // BLOCK API
+       _orig_fastpath_glGetQueryObjectuiv(id, pname, params);
+
+       goto finish;
+
+finish:
+       _COREGL_FASTPATH_FUNC_END();
+}
+
+
 void
 fastpath_glDrawBuffers(GLsizei n, const GLenum* bufs)
 {
@@ -5516,7 +5555,7 @@ finish:
 
 ////////////////////////////////////////////////////////////////////////
 void
-fastpath_glGenSamplers(GLsizei count, GLuint* samplers)
+fastpath_glGenSamplers(GLsizei n, GLuint* samplers)
 {
        int i;
        GLuint *objid_array = NULL;
@@ -5531,7 +5570,7 @@ fastpath_glGenSamplers(GLsizei count, GLuint* samplers)
                goto finish;
        }
        if (n == 0) goto finish;
-       if (arrays == NULL) goto finish;
+       if (samplers == NULL) goto finish;
 
        AST(current_ctx->ostate.shared != NULL);
 
@@ -5558,7 +5597,7 @@ finish:
 
 
 void
-fastpath_glBindVertexArray(GLuint array)
+fastpath_glBindSampler(GLuint unit, GLuint sampler)
 {
        GLuint real_obj;
 
@@ -5566,20 +5605,13 @@ fastpath_glBindVertexArray(GLuint array)
        _COREGL_FASTPATH_FUNC_BEGIN();
        INIT_FASTPATH_GL_FUNC();
 
-       if (GET_REAL_OBJ(GL_OBJECT_TYPE_VERTEXARRAY, array, &real_obj) != 1)
+       if (GET_REAL_OBJ(GL_OBJECT_TYPE_SAMPLER, sampler, &real_obj) != 1)
        {
                _set_gl_error(GL_OUT_OF_MEMORY);
                goto finish;
        }
 
-       if (current_ctx->gl_vertex_array_binding[0] != real_obj)
-       {
-               IF_GL_SUCCESS(_orig_fastpath_glBindVertexArray(real_obj))
-               {
-                       current_ctx->_misc_flag3 |= _MISC_FLAG3_BIT_gl_vertex_array_binding;
-                       current_ctx->gl_vertex_array_binding[0] = real_obj;
-               }
-       }
+       _orig_fastpath_glBindSampler(unit, real_obj);
        goto finish;
 
 finish:
@@ -5588,7 +5620,7 @@ finish:
 
 
 GLboolean
-fastpath_glIsVertexArray(GLuint array)
+fastpath_glIsSampler(GLuint sampler)
 {
        GLboolean ret = GL_FALSE;
        GLuint real_obj;
@@ -5597,13 +5629,13 @@ fastpath_glIsVertexArray(GLuint array)
        _COREGL_FASTPATH_FUNC_BEGIN();
        INIT_FASTPATH_GL_FUNC();
 
-       if (GET_REAL_OBJ(GL_OBJECT_TYPE_VERTEXARRAY, array, &real_obj) != 1)
+       if (GET_REAL_OBJ(GL_OBJECT_TYPE_SAMPLER, sampler, &real_obj) != 1)
        {
                ret = GL_FALSE;
                goto finish;
        }
 
-       ret = _orig_fastpath_glIsVertexArray(real_obj);
+       ret = _orig_fastpath_glIsSampler(real_obj);
 
        goto finish;
 
@@ -5614,7 +5646,7 @@ finish:
 
 
 void
-fastpath_glDeleteSamplers(GLsizei count, const GLuint* samplers)
+fastpath_glDeleteSamplers(GLsizei n, const GLuint* samplers)
 {
        int i;
        GLuint *objid_array = NULL;
@@ -5629,7 +5661,7 @@ fastpath_glDeleteSamplers(GLsizei count, const GLuint* samplers)
                goto finish;
        }
        if (n == 0) goto finish;
-       if (arrays == NULL) goto finish;
+       if (samplers == NULL) goto finish;
 
        AST(current_ctx->ostate.shared != NULL);
 
@@ -5640,7 +5672,7 @@ fastpath_glDeleteSamplers(GLsizei count, const GLuint* samplers)
                for (i = 0; i < n; i++)
                {
                        int real_objid = _COREGL_INT_INIT_VALUE;
-                       if (arrays[i] == 0) continue;
+                       if (samplers[i] == 0) continue;
 
                        real_objid = fastpath_ostate_get_object(&current_ctx->ostate, GL_OBJECT_TYPE_SAMPLER, samplers[i]);
                        if (real_objid == 0) continue;
@@ -5649,24 +5681,7 @@ fastpath_glDeleteSamplers(GLsizei count, const GLuint* samplers)
                        objid_array[real_n++] = real_objid;
                }
 
-               IF_GL_SUCCESS(_orig_fastpath_glDeleteSamplers(real_n, objid_array))
-               {
-                       for (i = 0; i < real_n; i++)
-                       {
-                               General_Trace_List *current = NULL;
-                               current = current_ctx->ostate.shared->using_gctxs;
-
-                               while (current != NULL)
-                               {
-                                       GLGlueContext *cur_gctx = (GLGlueContext *)current->value;
-
-                                       if (cur_gctx->gl_vertex_array_binding[0] == objid_array[i])
-                                               cur_gctx->gl_vertex_array_binding[0] = 0;
-
-                                       current = current->next;
-                               }
-                       }
-               }
+               _orig_fastpath_glDeleteSamplers(real_n, objid_array);
        }
 
        goto finish;
@@ -5683,38 +5698,23 @@ finish:
 ////////////////////////////////////////////////////////////////////////
 
 
-
-
-
-
-
-/* ES 3.0 BLOCK (UNTIL SUPPORT) */
-#define SIGILL_ERROR() \
-       COREGL_ERR("\E[40;31;1mFASTPATH can't support ES3.0 API '%s' (will be terminated with Illegal instruction!)\E[0m\n", __func__); \
-       kill(getpid(), SIGILL)
-
-
-
-GLboolean
-fastpath_glIsSampler(GLuint sampler)
+void
+fastpath_glSamplerParameteri(GLuint sampler, GLenum pname, GLint param)
 {
        GLboolean ret = GL_FALSE;
+       GLuint real_obj;
 
-       _COREGL_FASTPATH_FUNC_BEGIN();  SIGILL_ERROR(); // BLOCK API
-       ret = _orig_fastpath_glIsSampler(sampler);
-
-       goto finish;
+       DEFINE_FASTPAH_GL_FUNC();
+       _COREGL_FASTPATH_FUNC_BEGIN();
+       INIT_FASTPATH_GL_FUNC();
 
-finish:
-       _COREGL_FASTPATH_FUNC_END();
-       return ret;
-}
+       if (GET_REAL_OBJ(GL_OBJECT_TYPE_SAMPLER, sampler, &real_obj) != 1)
+       {
+               ret = GL_FALSE;
+               goto finish;
+       }
 
-void
-fastpath_glBindSampler(GLuint unit, GLuint sampler)
-{
-       _COREGL_FASTPATH_FUNC_BEGIN();  SIGILL_ERROR(); // BLOCK API
-       _orig_fastpath_glBindSampler(unit, sampler);
+       _orig_fastpath_glSamplerParameteri(real_obj, pname, param);
 
        goto finish;
 
@@ -5723,22 +5723,22 @@ finish:
 }
 
 void
-fastpath_glSamplerParameteri(GLuint sampler, GLenum pname, GLint param)
+fastpath_glSamplerParameteriv(GLuint sampler, GLenum pname, const GLint* param)
 {
-       _COREGL_FASTPATH_FUNC_BEGIN();  SIGILL_ERROR(); // BLOCK API
-       _orig_fastpath_glSamplerParameteri(sampler, pname, param);
+       GLboolean ret = GL_FALSE;
+       GLuint real_obj;
 
-       goto finish;
+       DEFINE_FASTPAH_GL_FUNC();
+       _COREGL_FASTPATH_FUNC_BEGIN();
+       INIT_FASTPATH_GL_FUNC();
 
-finish:
-       _COREGL_FASTPATH_FUNC_END();
-}
+       if (GET_REAL_OBJ(GL_OBJECT_TYPE_SAMPLER, sampler, &real_obj) != 1)
+       {
+               ret = GL_FALSE;
+               goto finish;
+       }
 
-void
-fastpath_glSamplerParameteriv(GLuint sampler, GLenum pname, const GLint* param)
-{
-       _COREGL_FASTPATH_FUNC_BEGIN();  SIGILL_ERROR(); // BLOCK API
-       _orig_fastpath_glSamplerParameteriv(sampler, pname, param);
+       _orig_fastpath_glSamplerParameteriv(real_obj, pname, param);
 
        goto finish;
 
@@ -5749,20 +5749,20 @@ finish:
 void
 fastpath_glSamplerParameterf(GLuint sampler, GLenum pname, GLfloat param)
 {
-       _COREGL_FASTPATH_FUNC_BEGIN();  SIGILL_ERROR(); // BLOCK API
-       _orig_fastpath_glSamplerParameterf(sampler, pname, param);
+       GLboolean ret = GL_FALSE;
+       GLuint real_obj;
 
-       goto finish;
+       DEFINE_FASTPAH_GL_FUNC();
+       _COREGL_FASTPATH_FUNC_BEGIN();
+       INIT_FASTPATH_GL_FUNC();
 
-finish:
-       _COREGL_FASTPATH_FUNC_END();
-}
+       if (GET_REAL_OBJ(GL_OBJECT_TYPE_SAMPLER, sampler, &real_obj) != 1)
+       {
+               ret = GL_FALSE;
+               goto finish;
+       }
 
-void
-fastpath_glSamplerParameterfv(GLuint sampler, GLenum pname, const GLfloat* param)
-{
-       _COREGL_FASTPATH_FUNC_BEGIN();  SIGILL_ERROR(); // BLOCK API
-       _orig_fastpath_glSamplerParameterfv(sampler, pname, param);
+       _orig_fastpath_glSamplerParameterf(real_obj, pname, param);
 
        goto finish;
 
@@ -5771,22 +5771,22 @@ finish:
 }
 
 void
-fastpath_glGetSamplerParameteriv(GLuint sampler, GLenum pname, GLint* params)
+fastpath_glSamplerParameterfv(GLuint sampler, GLenum pname, const GLfloat* param)
 {
-       _COREGL_FASTPATH_FUNC_BEGIN();  SIGILL_ERROR(); // BLOCK API
-       _orig_fastpath_glGetSamplerParameteriv(sampler, pname, params);
+       GLboolean ret = GL_FALSE;
+       GLuint real_obj;
 
-       goto finish;
+       DEFINE_FASTPAH_GL_FUNC();
+       _COREGL_FASTPATH_FUNC_BEGIN();
+       INIT_FASTPATH_GL_FUNC();
 
-finish:
-       _COREGL_FASTPATH_FUNC_END();
-}
+       if (GET_REAL_OBJ(GL_OBJECT_TYPE_SAMPLER, sampler, &real_obj) != 1)
+       {
+               ret = GL_FALSE;
+               goto finish;
+       }
 
-void
-fastpath_glGetSamplerParameterfv(GLuint sampler, GLenum pname, GLfloat* params)
-{
-       _COREGL_FASTPATH_FUNC_BEGIN();  SIGILL_ERROR(); // BLOCK API
-       _orig_fastpath_glGetSamplerParameterfv(sampler, pname, params);
+       _orig_fastpath_glSamplerParameterfv(real_obj, pname, param);
 
        goto finish;
 
@@ -5795,22 +5795,22 @@ finish:
 }
 
 void
-fastpath_glVertexAttribDivisor(GLuint index, GLuint divisor)
+fastpath_glGetSamplerParameteriv(GLuint sampler, GLenum pname, GLint* params)
 {
-       _COREGL_FASTPATH_FUNC_BEGIN();  SIGILL_ERROR(); // BLOCK API
-       _orig_fastpath_glVertexAttribDivisor(index, divisor);
+       GLboolean ret = GL_FALSE;
+       GLuint real_obj;
 
-       goto finish;
+       DEFINE_FASTPAH_GL_FUNC();
+       _COREGL_FASTPATH_FUNC_BEGIN();
+       INIT_FASTPATH_GL_FUNC();
 
-finish:
-       _COREGL_FASTPATH_FUNC_END();
-}
+       if (GET_REAL_OBJ(GL_OBJECT_TYPE_SAMPLER, sampler, &real_obj) != 1)
+       {
+               ret = GL_FALSE;
+               goto finish;
+       }
 
-void
-fastpath_glProgramParameteri(GLuint program, GLenum pname, GLint value)
-{
-       _COREGL_FASTPATH_FUNC_BEGIN();  SIGILL_ERROR(); // BLOCK API
-       _orig_fastpath_glProgramParameteri(program, pname, value);
+       _orig_fastpath_glGetSamplerParameteriv(real_obj, pname, params);
 
        goto finish;
 
@@ -5819,22 +5819,22 @@ finish:
 }
 
 void
-fastpath_glInvalidateFramebuffer(GLenum target, GLsizei numAttachments, const GLenum* attachments)
+fastpath_glGetSamplerParameterfv(GLuint sampler, GLenum pname, GLfloat* params)
 {
-       _COREGL_FASTPATH_FUNC_BEGIN();  SIGILL_ERROR(); // BLOCK API
-       _orig_fastpath_glInvalidateFramebuffer(target, numAttachments, attachments);
+       GLboolean ret = GL_FALSE;
+       GLuint real_obj;
 
-       goto finish;
+       DEFINE_FASTPAH_GL_FUNC();
+       _COREGL_FASTPATH_FUNC_BEGIN();
+       INIT_FASTPATH_GL_FUNC();
 
-finish:
-       _COREGL_FASTPATH_FUNC_END();
-}
+       if (GET_REAL_OBJ(GL_OBJECT_TYPE_SAMPLER, sampler, &real_obj) != 1)
+       {
+               ret = GL_FALSE;
+               goto finish;
+       }
 
-void
-fastpath_glInvalidateSubFramebuffer(GLenum target, GLsizei numAttachments, const GLenum* attachments, GLint x, GLint y, GLsizei width, GLsizei height)
-{
-       _COREGL_FASTPATH_FUNC_BEGIN();  SIGILL_ERROR(); // BLOCK API
-       _orig_fastpath_glInvalidateSubFramebuffer(target, numAttachments, attachments, x, y, width, height);
+       _orig_fastpath_glGetSamplerParameterfv(real_obj, pname, params);
 
        goto finish;
 
@@ -5842,44 +5842,28 @@ finish:
        _COREGL_FASTPATH_FUNC_END();
 }
 
-void
-fastpath_glTexStorage2D(GLenum target, GLsizei levels, GLenum internalformat, GLsizei width, GLsizei height)
-{
-       _COREGL_FASTPATH_FUNC_BEGIN();  SIGILL_ERROR(); // BLOCK API
-       _orig_fastpath_glTexStorage2D(target, levels, internalformat, width, height);
-
-       goto finish;
-
-finish:
-       _COREGL_FASTPATH_FUNC_END();
-}
 
 void
-fastpath_glTexStorage3D(GLenum target, GLsizei levels, GLenum internalformat, GLsizei width, GLsizei height, GLsizei depth)
+fastpath_glVertexAttribDivisor(GLuint index, GLuint divisor)
 {
-       _COREGL_FASTPATH_FUNC_BEGIN();  SIGILL_ERROR(); // BLOCK API
-       _orig_fastpath_glTexStorage3D(target, levels, internalformat, width, height, depth);
+       DEFINE_FASTPAH_GL_FUNC();
+       _COREGL_FASTPATH_FUNC_BEGIN();
+       INIT_FASTPATH_GL_FUNC();
 
+       IF_GL_SUCCESS(_orig_fastpath_glVertexAttribDivisor(index, divisor))
+       {
+               current_ctx->_vattrib_flag |= _VATTRIB_FLAG_BIT_gl_vertex_array;
+               current_ctx->gl_vertex_array_divisor[index] = divisor;
+       }
        goto finish;
 
 finish:
        _COREGL_FASTPATH_FUNC_END();
 }
 
-void
-fastpath_glGetInternalformativ(GLenum target, GLenum internalformat, GLenum pname, GLsizei bufSize, GLint* params)
-{
-       _COREGL_FASTPATH_FUNC_BEGIN();  SIGILL_ERROR(); // BLOCK API
-       _orig_fastpath_glGetInternalformativ(target, internalformat, pname, bufSize, params);
-
-       goto finish;
-
-finish:
-       _COREGL_FASTPATH_FUNC_END();
-}
 
 void
-fastpath_glBeginQuery(GLenum target, GLuint id)
+fastpath_glProgramParameteri(GLuint program, GLenum pname, GLint value)
 {
        GLuint real_obj;
 
@@ -5887,27 +5871,13 @@ fastpath_glBeginQuery(GLenum target, GLuint id)
        _COREGL_FASTPATH_FUNC_BEGIN();
        INIT_FASTPATH_GL_FUNC();
 
-       if (GET_REAL_OBJ(GL_OBJECT_TYPE_QUERY, id, &real_obj) != 1)
+       if (GET_REAL_OBJ(GL_OBJECT_TYPE_PROGRAM, program, &real_obj) != 1)
        {
-               _set_gl_error(GL_OUT_OF_MEMORY);
+               _set_gl_error(GL_INVALID_VALUE);
                goto finish;
        }
 
-       IF_GL_SUCCESS(_orig_fastpath_glBeginQuery(target, real_obj))
-       {
-       }
-
-       goto finish;
-
-finish:
-       _COREGL_FASTPATH_FUNC_END();
-}
-
-void
-fastpath_glEndQuery(GLenum target)
-{
-       _COREGL_FASTPATH_FUNC_BEGIN();  SIGILL_ERROR(); // BLOCK API
-       _orig_fastpath_glEndQuery(target);
+       _orig_fastpath_glProgramParameteri(real_obj, pname, value);
 
        goto finish;
 
@@ -5915,27 +5885,4 @@ finish:
        _COREGL_FASTPATH_FUNC_END();
 }
 
-void
-fastpath_glGetQueryiv(GLenum target, GLenum pname, GLint* params)
-{
-       _COREGL_FASTPATH_FUNC_BEGIN();  SIGILL_ERROR(); // BLOCK API
-       _orig_fastpath_glGetQueryiv(target, pname, params);
-
-       goto finish;
-
-finish:
-       _COREGL_FASTPATH_FUNC_END();
-}
-
-void
-fastpath_glGetQueryObjectuiv(GLuint id, GLenum pname, GLuint* params)
-{
-       _COREGL_FASTPATH_FUNC_BEGIN();  SIGILL_ERROR(); // BLOCK API
-       _orig_fastpath_glGetQueryObjectuiv(id, pname, params);
-
-       goto finish;
-
-finish:
-       _COREGL_FASTPATH_FUNC_END();
-}
 

diff --git a/src/modules/fastpath/coregl_fastpath_state.h b/src/modules/fastpath/coregl_fastpath_state.h
index ece5b0b..047f4bd 100644 (file)
--- a/src/modules/fastpath/coregl_fastpath_state.h
+++ b/src/modules/fastpath/coregl_fastpath_state.h
@@ -177,6 +177,9 @@ GLUE_STATE(GLboolean, gl_vertex_array_normalized, INITIAL_CTX->gl_num_vertex_att
 GLUE_STATE(GLboolean, gl_vertex_array_integer, INITIAL_CTX->gl_num_vertex_attribs[0], MAX_VERTEX_ATTRIBS,
            SET_N(INITIAL_CTX->gl_num_vertex_attribs[0], 1, SET_1(GL_FALSE)),
            SET_N(INITIAL_CTX->gl_num_vertex_attribs[0], 1, _sym_glGetVertexAttribiv(i, GL_VERTEX_ATTRIB_ARRAY_INTEGER, (GLint *)value);))
+GLUE_STATE(GLuint, gl_vertex_array_divisor, INITIAL_CTX->gl_num_vertex_attribs[0], MAX_VERTEX_ATTRIBS,
+           SET_N(INITIAL_CTX->gl_num_vertex_attribs[0], 1, SET_1(GL_FALSE)),
+           SET_N(INITIAL_CTX->gl_num_vertex_attribs[0], 1, _sym_glGetVertexAttribiv(i, GL_VERTEX_ATTRIB_ARRAY_DIVISOR, (GLint *)value);))
 GLUE_STATE(GLsizei, gl_vertex_array_stride, INITIAL_CTX->gl_num_vertex_attribs[0], MAX_VERTEX_ATTRIBS,
            SET_N(INITIAL_CTX->gl_num_vertex_attribs[0], 1, SET_1(GL_FALSE)),
            SET_N(INITIAL_CTX->gl_num_vertex_attribs[0], 1, _sym_glGetVertexAttribiv(i, GL_VERTEX_ATTRIB_ARRAY_STRIDE, (GLint *)value);))

diff --git a/src/modules/tracepath/coregl_tracepath_gl.c b/src/modules/tracepath/coregl_tracepath_gl.c
index 94a4ec8..3ff8aa5 100644 (file)
--- a/src/modules/tracepath/coregl_tracepath_gl.c
+++ b/src/modules/tracepath/coregl_tracepath_gl.c
@@ -3398,10 +3398,10 @@ finish:
 }
 
 void
-tracepath_glGenSamplers(GLsizei count, GLuint* samplers)
+tracepath_glGenSamplers(GLsizei n, GLuint* samplers)
 {
        _COREGL_TRACEPATH_FUNC_BEGIN();
-       _orig_tracepath_glGenSamplers(count, samplers);
+       _orig_tracepath_glGenSamplers(n, samplers);
 
        goto finish;
 
@@ -3410,10 +3410,10 @@ finish:
 }
 
 void
-tracepath_glDeleteSamplers(GLsizei count, const GLuint* samplers)
+tracepath_glDeleteSamplers(GLsizei n, const GLuint* samplers)
 {
        _COREGL_TRACEPATH_FUNC_BEGIN();
-       _orig_tracepath_glDeleteSamplers(count, samplers);
+       _orig_tracepath_glDeleteSamplers(n, samplers);
 
        goto finish;
 

diff --git a/src/wraps/coregl_gl.c b/src/wraps/coregl_gl.c
index 73ed66f..fdecec8 100755 (executable)
--- a/src/wraps/coregl_gl.c
+++ b/src/wraps/coregl_gl.c
@@ -1381,15 +1381,15 @@ glGetBufferParameteri64v(GLenum target, GLenum pname, GLint64* params)
 }
 
 void
-glGenSamplers(GLsizei count, GLuint* samplers)
+glGenSamplers(GLsizei n, GLuint* samplers)
 {
-       ovr_glGenSamplers(count, samplers);
+       ovr_glGenSamplers(n, samplers);
 }
 
 void
-glDeleteSamplers(GLsizei count, const GLuint* samplers)
+glDeleteSamplers(GLsizei n, const GLuint* samplers)
 {
-       ovr_glDeleteSamplers(count, samplers);
+       ovr_glDeleteSamplers(n, samplers);
 }
 
 GLboolean