projects
/
mesa.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
mesa: fix AtomicBuffer typo in _mesa_DeleteBuffers
[mesa.git]
/
src
/
mesa
/
main
/
getstring.c
diff --git
a/src/mesa/main/getstring.c
b/src/mesa/main/getstring.c
index 3ac62d402ab4b09bb6d638b7ddfc545df944195e..1b2c7f054f6489cb97d0ac2d43fdce3a3176910b 100644
(file)
--- a/
src/mesa/main/getstring.c
+++ b/
src/mesa/main/getstring.c
@@
-58,6
+58,12
@@
shading_language_version(struct gl_context *ctx)
return (const GLubyte *) "4.10";
case 420:
return (const GLubyte *) "4.20";
return (const GLubyte *) "4.10";
case 420:
return (const GLubyte *) "4.20";
+ case 430:
+ return (const GLubyte *) "4.30";
+ case 440:
+ return (const GLubyte *) "4.40";
+ case 450:
+ return (const GLubyte *) "4.50";
default:
_mesa_problem(ctx,
"Invalid GLSL version in shading_language_version()");
default:
_mesa_problem(ctx,
"Invalid GLSL version in shading_language_version()");
@@
-68,7
+74,7
@@
shading_language_version(struct gl_context *ctx)
case API_OPENGLES2:
return (ctx->Version < 30)
? (const GLubyte *) "OpenGL ES GLSL ES 1.0.16"
case API_OPENGLES2:
return (ctx->Version < 30)
? (const GLubyte *) "OpenGL ES GLSL ES 1.0.16"
- : (const GLubyte *) "OpenGL ES GLSL ES 3.0";
+ : (const GLubyte *) "OpenGL ES GLSL ES 3.0
0
";
case API_OPENGLES:
/* fall-through */
case API_OPENGLES:
/* fall-through */
@@
-166,7
+172,7
@@
_mesa_GetStringi(GLenum name, GLuint index)
}
return _mesa_get_enabled_extension(ctx, index);
default:
}
return _mesa_get_enabled_extension(ctx, index);
default:
- _mesa_error(
ctx, GL_INVALID_ENUM, "glGetString"
);
+ _mesa_error(
ctx, GL_INVALID_ENUM, "glGetStringi"
);
return (const GLubyte *) 0;
}
}
return (const GLubyte *) 0;
}
}
@@
-253,22
+259,11
@@
_mesa_GetPointerv( GLenum pname, GLvoid **params )
*params = (GLvoid *) ctx->Array.VAO->VertexAttrib[VERT_ATTRIB_POINT_SIZE].Ptr;
break;
case GL_DEBUG_CALLBACK_FUNCTION_ARB:
*params = (GLvoid *) ctx->Array.VAO->VertexAttrib[VERT_ATTRIB_POINT_SIZE].Ptr;
break;
case GL_DEBUG_CALLBACK_FUNCTION_ARB:
- if (!_mesa_is_desktop_gl(ctx)) {
- goto invalid_pname;
- }
- else {
- struct gl_debug_state *debug = _mesa_get_debug_state(ctx);
- *params = debug ? (void *) debug->Callback : NULL;
- }
- break;
case GL_DEBUG_CALLBACK_USER_PARAM_ARB:
case GL_DEBUG_CALLBACK_USER_PARAM_ARB:
- if (!_mesa_is_desktop_gl(ctx))
{
+ if (!_mesa_is_desktop_gl(ctx))
goto invalid_pname;
goto invalid_pname;
- }
- else {
- struct gl_debug_state *debug = _mesa_get_debug_state(ctx);
- *params = debug ? (void *) debug->CallbackData : NULL;
- }
+ else
+ *params = _mesa_get_debug_state_ptr(ctx, pname);
break;
default:
goto invalid_pname;
break;
default:
goto invalid_pname;