[PATCH 1/8] glx: Refresh generated code

Jon TURNEY jon.turney at dronecode.org.uk
Wed Dec 4 07:15:40 PST 2013


On 03/12/2013 20:14, Adam Jackson wrote:
> This just brings the code into sync with current Mesa master.

> --- a/glx/indirect_size_get.c
> +++ b/glx/indirect_size_get.c
> @@ -603,7 +603,11 @@ __glGetBooleanv_size(GLenum e)
>      case GL_OCCLUSION_TEST_RESULT_HP:
>      case GL_LIGHT_MODEL_COLOR_CONTROL:
>      case GL_DEBUG_NEXT_LOGGED_MESSAGE_LENGTH_ARB:
> +/*      case GL_DEBUG_NEXT_LOGGED_MESSAGE_LENGTH:*/
>      case GL_RESET_NOTIFICATION_STRATEGY_ARB:
> +    case GL_MAX_DEBUG_GROUP_STACK_DEPTH:
> +    case GL_DEBUG_GROUP_STACK_DEPTH:
> +    case GL_MAX_LABEL_LENGTH:

Compiling with mesa 8.0.5 installed I get:

  CC       indirect_size_get.lo
/xserver/glx/indirect_size_get.c: In function '__glGetBooleanv_size':
/xserver/glx/indirect_size_get.c:608:10: error:
'GL_MAX_DEBUG_GROUP_STACK_DEPTH' undeclared (first use in this function)
     case GL_MAX_DEBUG_GROUP_STACK_DEPTH:
          ^
/xserver/glx/indirect_size_get.c:608:10: note: each undeclared identifier is
reported only once for each function it appears in
/xserver/glx/indirect_size_get.c:609:10: error: 'GL_DEBUG_GROUP_STACK_DEPTH'
undeclared (first use in this function)
     case GL_DEBUG_GROUP_STACK_DEPTH:
          ^
/xserver/glx/indirect_size_get.c:610:10: error: 'GL_MAX_LABEL_LENGTH'
undeclared (first use in this function)
     case GL_MAX_LABEL_LENGTH:
          ^

So I think either the use of these symbols needs to be made conditional on
them being defined, or the libGL version required needs to be raised in
configure.ac from 7.1.0, but I don't know what to...?

(Later)
Uses of __DRI_ATTRIB_UNSIGNED_FLOAT_BIT and __DRI_ATTRIB_FLOAT_BIT were added
in ccc8bb11, and the libGL requirement bumped to 9.2.0

81c123ea changes this back to 7.1.0, unless dri2 is being built, which doesn't
seem quite right because we also need them for dricommon and hence driswrast...



More information about the xorg-devel mailing list