wined3d: Add some GLSL definitions to wined3d_gl.h

Jason Green jave27 at gmail.com
Thu May 18 01:05:26 CDT 2006


Please use this one instead.  I found a few more things that should be added.

On 5/18/06, Jason Green <jave27 at gmail.com> wrote:
> These are not all of the defines for GL_ARB_shader_objects, but they
> are the only ones I need so far.
>
>
>
-------------- next part --------------
diff --git a/include/wine/wined3d_gl.h b/include/wine/wined3d_gl.h
index 92f4267..12ddfab 100644
--- a/include/wine/wined3d_gl.h
+++ b/include/wine/wined3d_gl.h
@@ -521,6 +521,33 @@ typedef GLvoid* (APIENTRY * PGLFNMAPBUFF
 typedef GLboolean (APIENTRY * PGLFNUNMAPBUFFERARBPROC) (GLenum target);
 typedef void (APIENTRY * PGLFNGETBUFFERPARAMETERIVARBPROC) (GLenum target, GLenum pname, GLint *params);
 typedef void (APIENTRY * PGLFNGETBUFFERPOINTERVARBPROC) (GLenum target, GLenum pname, GLvoid* *params);
+/* GL_ARB_shader_objects (GLSL) */
+#ifndef GL_ARB_shader_objects
+#define GL_ARB_shader_objects 1
+typedef char GLcharARB;
+typedef unsigned int GLhandleARB;
+#endif
+#ifndef GL_ARB_fragment_shader
+#define GL_ARB_fragment_shader 1
+#define GL_FRAGMENT_SHADER_ARB                  0x8B30
+#define GL_MAX_FRAGMENT_UNIFORM_COMPONENTS_ARB  0x8B49
+#endif
+#ifndef GL_ARB_vertex_shader
+#define GL_ARB_vertex_shader 1
+#define GL_VERTEX_SHADER_ARB                    0x8B31
+#define GL_MAX_VERTEX_UNIFORM_COMPONENTS_ARB    0x8B4A
+#define GL_MAX_VARYING_FLOATS_ARB               0x8B4B
+#define GL_MAX_VERTEX_TEXTURE_IMAGE_UNITS_ARB   0x8B4C
+#define GL_MAX_COMBINED_TEXTURE_IMAGE_UNITS_ARB 0x8B4D
+#endif
+typedef void (APIENTRY * PGLFNGETINFOLOGARBPROC) (GLhandleARB programObj, GLint maxLen, GLint *len, GLcharARB *log);
+typedef void (APIENTRY * PGLFNUSEPROGRAMOBJECTARBPROC) (GLhandleARB programObj);
+typedef GLhandleARB (APIENTRY * PFNGLCREATESHADEROBJECTARBPROC) (GLenum shaderType);
+typedef void (APIENTRY * PFNGLSHADERSOURCEARBPROC) (GLhandleARB shaderObj, GLsizei count, const GLcharARB* *string, const GLint *length);
+typedef void (APIENTRY * PFNGLCOMPILESHADERARBPROC) (GLhandleARB shaderObj);
+typedef GLhandleARB (APIENTRY * PFNGLCREATEPROGRAMOBJECTARBPROC) (void);
+typedef void (APIENTRY * PFNGLATTACHOBJECTARBPROC) (GLhandleARB containerObj, GLhandleARB obj);
+typedef void (APIENTRY * PFNGLLINKPROGRAMARBPROC) (GLhandleARB programObj);
 /* GL_EXT_texture_compression_s3tc */
 #ifndef GL_EXT_texture_compression_s3tc
 #define GL_EXT_texture_compression_s3tc 1
@@ -1233,6 +1260,15 @@ typedef enum _GL_SupportedExt {
     USE_GL_FUNC(PGLFNVERTEXATTRIBPOINTERARBPROC,      glVertexAttribPointerARB); \
     USE_GL_FUNC(PGLFNENABLEVERTEXATTRIBARRAYARBPROC,  glEnableVertexAttribArrayARB); \
     USE_GL_FUNC(PGLFNDISABLEVERTEXATTRIBARRAYARBPROC, glDisableVertexAttribArrayARB); \
+    /* GL_ARB_shader_objects */ \
+    USE_GL_FUNC(PGLFNGETINFOLOGARBPROC,               glGetInfoLogARB); \
+    USE_GL_FUNC(PGLFNUSEPROGRAMOBJECTARBPROC,         glUseProgramObjectARB); \
+    USE_GL_FUNC(PFNGLCREATESHADEROBJECTARBPROC,       glCreateShaderObjectARB); \
+    USE_GL_FUNC(PFNGLSHADERSOURCEARBPROC,             glShaderSourceARB); \
+    USE_GL_FUNC(PFNGLCOMPILESHADERARBPROC,            glCompileShaderARB); \
+    USE_GL_FUNC(PFNGLCREATEPROGRAMOBJECTARBPROC,      glCreateProgramObjectARB); \
+    USE_GL_FUNC(PFNGLATTACHOBJECTARBPROC,             glAttachObjectARB); \
+    USE_GL_FUNC(PFNGLLINKPROGRAMARBPROC,              glLinkProgramARB); \
     /* GL_EXT_stencil_two_side */ \
     USE_GL_FUNC(PGLFNACTIVESTENCILFACEEXTPROC, glActiveStencilFaceEXT); \
     /* GL_ATI_separate_stencil */ \


More information about the wine-patches mailing list