Mesa (intel-2008-q3): GLSL: Implement _mesa_get_handle
Ian Romanick
idr at kemper.freedesktop.org
Mon Sep 29 19:39:41 UTC 2008
Module: Mesa
Branch: intel-2008-q3
Commit: 41473ac9a0a2b3438451ed83fdfafe60fbfd1121
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=41473ac9a0a2b3438451ed83fdfafe60fbfd1121
Author: Ian Romanick <ian.d.romanick at intel.com>
Date: Mon Sep 29 12:27:00 2008 -0700
GLSL: Implement _mesa_get_handle
Implementing _mesa_get_handle in using
glGetIntegerv(GL_CURRENT_PROGRAM, ...) allows glGetHandleARB to work.
(cherry picked from commit 905d8e0742d200558677dac01a838e95877f7b5e)
---
src/mesa/shader/shader_api.c | 25 ++++++++-----------------
1 files changed, 8 insertions(+), 17 deletions(-)
diff --git a/src/mesa/shader/shader_api.c b/src/mesa/shader/shader_api.c
index e659b52..56763f4 100644
--- a/src/mesa/shader/shader_api.c
+++ b/src/mesa/shader/shader_api.c
@@ -47,7 +47,7 @@
#include "shader/shader_api.h"
#include "shader/slang/slang_compile.h"
#include "shader/slang/slang_link.h"
-
+#include "glapi/dispatch.h"
/**
@@ -858,24 +858,15 @@ _mesa_get_attached_shaders(GLcontext *ctx, GLuint program, GLsizei maxCount,
static GLuint
_mesa_get_handle(GLcontext *ctx, GLenum pname)
{
-#if 0
- GET_CURRENT_CONTEXT(ctx);
-
- switch (pname) {
- case GL_PROGRAM_OBJECT_ARB:
- {
- struct gl2_program_intf **pro = ctx->Shader.CurrentProgram;
-
- if (pro != NULL)
- return (**pro)._container._generic.
- GetName((struct gl2_generic_intf **) (pro));
- }
- break;
- default:
+ GLint handle = 0;
+
+ if (pname == GL_PROGRAM_OBJECT_ARB) {
+ CALL_GetIntegerv(ctx->Exec, (GL_CURRENT_PROGRAM, &handle));
+ } else {
_mesa_error(ctx, GL_INVALID_ENUM, "glGetHandleARB");
}
-#endif
- return 0;
+
+ return handle;
}
More information about the mesa-commit
mailing list