diff options
| -rw-r--r-- | src/mesa/drivers/common/driverfuncs.c | 8 | ||||
| -rw-r--r-- | src/mesa/main/dd.h | 21 | ||||
| -rw-r--r-- | src/mesa/main/get.c | 16 | ||||
| -rw-r--r-- | src/mesa/main/get_gen.py | 5 | ||||
| -rw-r--r-- | src/mesa/main/getstring.c | 4 |
5 files changed, 0 insertions, 54 deletions
diff --git a/src/mesa/drivers/common/driverfuncs.c b/src/mesa/drivers/common/driverfuncs.c index ebfaa2f07b..e518c000dd 100644 --- a/src/mesa/drivers/common/driverfuncs.c +++ b/src/mesa/drivers/common/driverfuncs.c @@ -178,14 +178,6 @@ _mesa_init_driver_functions(struct dd_function_table *driver) driver->TexParameter = NULL; driver->Viewport = NULL; - /* state queries */ - driver->GetBooleanv = NULL; - driver->GetDoublev = NULL; - driver->GetFloatv = NULL; - driver->GetIntegerv = NULL; - driver->GetInteger64v = NULL; - driver->GetPointerv = NULL; - /* buffer objects */ _mesa_init_buffer_object_functions(driver); diff --git a/src/mesa/main/dd.h b/src/mesa/main/dd.h index 897051eec0..cab8f34404 100644 --- a/src/mesa/main/dd.h +++ b/src/mesa/main/dd.h @@ -706,27 +706,6 @@ struct dd_function_table { /*@}*/ - /** - * \name State-query functions - * - * Return GL_TRUE if query was completed, GL_FALSE otherwise. - */ - /*@{*/ - /** Return the value or values of a selected parameter */ - GLboolean (*GetBooleanv)(GLcontext *ctx, GLenum pname, GLboolean *result); - /** Return the value or values of a selected parameter */ - GLboolean (*GetDoublev)(GLcontext *ctx, GLenum pname, GLdouble *result); - /** Return the value or values of a selected parameter */ - GLboolean (*GetFloatv)(GLcontext *ctx, GLenum pname, GLfloat *result); - /** Return the value or values of a selected parameter */ - GLboolean (*GetIntegerv)(GLcontext *ctx, GLenum pname, GLint *result); - /** Return the value or values of a selected parameter */ - GLboolean (*GetInteger64v)(GLcontext *ctx, GLenum pname, GLint64 *result); - /** Return the value or values of a selected parameter */ - GLboolean (*GetPointerv)(GLcontext *ctx, GLenum pname, GLvoid **result); - /*@}*/ - - /** * \name Vertex/pixel buffer object functions */ diff --git a/src/mesa/main/get.c b/src/mesa/main/get.c index e3015cd603..2e8b0a4e8c 100644 --- a/src/mesa/main/get.c +++ b/src/mesa/main/get.c @@ -83,10 +83,6 @@ _mesa_GetBooleanv( GLenum pname, GLboolean *params ) if (!params) return; - if (ctx->Driver.GetBooleanv && - ctx->Driver.GetBooleanv(ctx, pname, params)) - return; - switch (pname) { case GL_ACCUM_RED_BITS: params[0] = INT_TO_BOOLEAN(ctx->DrawBuffer->Visual.accumRedBits); @@ -2000,10 +1996,6 @@ _mesa_GetFloatv( GLenum pname, GLfloat *params ) if (!params) return; - if (ctx->Driver.GetFloatv && - ctx->Driver.GetFloatv(ctx, pname, params)) - return; - switch (pname) { case GL_ACCUM_RED_BITS: params[0] = (GLfloat)(ctx->DrawBuffer->Visual.accumRedBits); @@ -3917,10 +3909,6 @@ _mesa_GetIntegerv( GLenum pname, GLint *params ) if (!params) return; - if (ctx->Driver.GetIntegerv && - ctx->Driver.GetIntegerv(ctx, pname, params)) - return; - switch (pname) { case GL_ACCUM_RED_BITS: params[0] = ctx->DrawBuffer->Visual.accumRedBits; @@ -5835,10 +5823,6 @@ _mesa_GetInteger64v( GLenum pname, GLint64 *params ) if (!params) return; - if (ctx->Driver.GetInteger64v && - ctx->Driver.GetInteger64v(ctx, pname, params)) - return; - switch (pname) { case GL_ACCUM_RED_BITS: params[0] = (GLint64)(ctx->DrawBuffer->Visual.accumRedBits); diff --git a/src/mesa/main/get_gen.py b/src/mesa/main/get_gen.py index 21f7750dbd..d7c543f368 100644 --- a/src/mesa/main/get_gen.py +++ b/src/mesa/main/get_gen.py @@ -1268,11 +1268,6 @@ def EmitGetFunction(stateVars, returnType, indexed): print " if (!params)" print " return;" print "" - if indexed == 0: - print " if (ctx->Driver.%s &&" % function - print " ctx->Driver.%s(ctx, pname, params))" % function - print " return;" - print "" print " switch (pname) {" for state in stateVars: diff --git a/src/mesa/main/getstring.c b/src/mesa/main/getstring.c index e3a60fa6eb..54db5794bf 100644 --- a/src/mesa/main/getstring.c +++ b/src/mesa/main/getstring.c @@ -172,10 +172,6 @@ _mesa_GetPointerv( GLenum pname, GLvoid **params ) if (MESA_VERBOSE & VERBOSE_API) _mesa_debug(ctx, "glGetPointerv %s\n", _mesa_lookup_enum_by_nr(pname)); - if (ctx->Driver.GetPointerv - && (*ctx->Driver.GetPointerv)(ctx, pname, params)) - return; - switch (pname) { case GL_VERTEX_ARRAY_POINTER: *params = (GLvoid *) ctx->Array.ArrayObj->Vertex.Ptr; |