DXGL r168 - Code Review

Jump to navigation Jump to search
Repository:DXGL
Revision:< r167‎ | r168 | r169 >
Date:13:19, 8 June 2012
Author:admin
Status:new
Tags:
Comment:
Fix shader compilation errors
Update glext.h and wglext.h
Modified paths:
  • /ddraw/glExtensions.cpp (modified) (history)
  • /ddraw/glExtensions.h (modified) (history)
  • /ddraw/include/GL/glext.h (modified) (history)
  • /ddraw/include/GL/wglext.h (modified) (history)
  • /ddraw/shadergen.cpp (modified) (history)

Diff [purge]

Index: ddraw/glExtensions.cpp
——@@ -19,7 +19,7 @@
2020 #include "glExtensions.h"
2121
2222 GLuint (APIENTRY *glCreateShader) (GLenum type) = NULL;
23 -void (APIENTRY *glShaderSource) (GLuint shader, GLsizei count, const GLchar** string, const GLint* length) = NULL;
 23+void (APIENTRY *glShaderSource) (GLuint shader, GLsizei count, const GLchar* const* string, const GLint* length) = NULL;
2424 void (APIENTRY *glCompileShader) (GLuint shader) = NULL;
2525 void (APIENTRY *glDeleteShader) (GLuint shader) = NULL;
2626 GLuint (APIENTRY *glCreateProgram) () = NULL;
Index: ddraw/glExtensions.h
——@@ -39,7 +39,7 @@
4040 #endif
4141
4242 GLAPI GLuint (APIENTRY *glCreateShader) (GLenum type);
43 -GLAPI void (APIENTRY *glShaderSource) (GLuint shader, GLsizei count, const GLchar** string, const GLint* length);
 43+GLAPI void (APIENTRY *glShaderSource) (GLuint shader, GLsizei count, const GLchar* const* string, const GLint* length);
4444 GLAPI void (APIENTRY *glCompileShader) (GLuint shader);
4545 GLAPI void (APIENTRY *glDeleteShader) (GLuint shader);
4646 GLAPI GLuint (APIENTRY *glCreateProgram) ();
Index: ddraw/include/GL/glext.h
——@@ -6,7 +6,7 @@
77 #endif
88
99 /*
10 -** Copyright (c) 2007-2011 The Khronos Group Inc.
 10+** Copyright (c) 2007-2012 The Khronos Group Inc.
1111 **
1212 ** Permission is hereby granted, free of charge, to any person obtaining a
1313 ** copy of this software and/or associated documentation files (the
——@@ -29,9 +29,9 @@
3030 */
3131
3232 /* Header file version number, required by OpenGL ABI for Linux */
33 -/* glext.h last updated $Date: 2011-12-19 02:48:12 -0800 (Mon, 19 Dec 2011) $ */
 33+/* glext.h last updated $Date: 2012-04-26 00:59:42 -0700 (Thu, 26 Apr 2012) $ */
3434 /* Current version at http://www.opengl.org/registry/ */
35 -#define GL_GLEXT_VERSION 74
 35+#define GL_GLEXT_VERSION 81
3636 /* Function declaration macros - to move into glplatform.h */
3737
3838 #if defined(_WIN32) && !defined(APIENTRY) && !defined(__CYGWIN__) && !defined(__SCITECH_SNAP__)
——@@ -1019,6 +1019,7 @@
10201020 /* reuse GL_MAX_VERTEX_UNIFORM_VECTORS */
10211021 /* reuse GL_MAX_VARYING_VECTORS */
10221022 /* reuse GL_MAX_FRAGMENT_UNIFORM_VECTORS */
 1023+/* reuse GL_RGB565 */
10231024 /* Reuse tokens from ARB_get_program_binary */
10241025 /* reuse GL_PROGRAM_BINARY_RETRIEVABLE_HINT */
10251026 /* reuse GL_PROGRAM_BINARY_LENGTH */
——@@ -1882,8 +1883,10 @@
18831884 #endif
18841885
18851886 #ifndef GL_ARB_copy_buffer
1886 -#define GL_COPY_READ_BUFFER 0x8F36
1887 -#define GL_COPY_WRITE_BUFFER 0x8F37
 1887+#define GL_COPY_READ_BUFFER_BINDING 0x8F36
 1888+#define GL_COPY_READ_BUFFER GL_COPY_READ_BUFFER_BINDING
 1889+#define GL_COPY_WRITE_BUFFER_BINDING 0x8F37
 1890+#define GL_COPY_WRITE_BUFFER GL_COPY_WRITE_BUFFER_BINDING
18881891 #endif
18891892
18901893 #ifndef GL_ARB_shader_texture_lod
——@@ -2131,8 +2134,10 @@
21322135
21332136 #ifndef GL_ARB_transform_feedback2
21342137 #define GL_TRANSFORM_FEEDBACK 0x8E22
2135 -#define GL_TRANSFORM_FEEDBACK_BUFFER_PAUSED 0x8E23
2136 -#define GL_TRANSFORM_FEEDBACK_BUFFER_ACTIVE 0x8E24
 2138+#define GL_TRANSFORM_FEEDBACK_PAUSED 0x8E23
 2139+#define GL_TRANSFORM_FEEDBACK_BUFFER_PAUSED GL_TRANSFORM_FEEDBACK_PAUSED
 2140+#define GL_TRANSFORM_FEEDBACK_ACTIVE 0x8E24
 2141+#define GL_TRANSFORM_FEEDBACK_BUFFER_ACTIVE GL_TRANSFORM_FEEDBACK_ACTIVE
21372142 #define GL_TRANSFORM_FEEDBACK_BINDING 0x8E25
21382143 #endif
21392144
——@@ -2156,6 +2161,7 @@
21572162 #define GL_MAX_VERTEX_UNIFORM_VECTORS 0x8DFB
21582163 #define GL_MAX_VARYING_VECTORS 0x8DFC
21592164 #define GL_MAX_FRAGMENT_UNIFORM_VECTORS 0x8DFD
 2165+#define GL_RGB565 0x8D62
21602166 #endif
21612167
21622168 #ifndef GL_ARB_get_program_binary
——@@ -5311,11 +5317,168 @@
53125318 #define GL_SCALED_RESOLVE_NICEST_EXT 0x90BB
53135319 #endif
53145320
 5321+#ifndef GL_NV_path_rendering
 5322+#define GL_PATH_FORMAT_SVG_NV 0x9070
 5323+#define GL_PATH_FORMAT_PS_NV 0x9071
 5324+#define GL_STANDARD_FONT_NAME_NV 0x9072
 5325+#define GL_SYSTEM_FONT_NAME_NV 0x9073
 5326+#define GL_FILE_NAME_NV 0x9074
 5327+#define GL_PATH_STROKE_WIDTH_NV 0x9075
 5328+#define GL_PATH_END_CAPS_NV 0x9076
 5329+#define GL_PATH_INITIAL_END_CAP_NV 0x9077
 5330+#define GL_PATH_TERMINAL_END_CAP_NV 0x9078
 5331+#define GL_PATH_JOIN_STYLE_NV 0x9079
 5332+#define GL_PATH_MITER_LIMIT_NV 0x907A
 5333+#define GL_PATH_DASH_CAPS_NV 0x907B
 5334+#define GL_PATH_INITIAL_DASH_CAP_NV 0x907C
 5335+#define GL_PATH_TERMINAL_DASH_CAP_NV 0x907D
 5336+#define GL_PATH_DASH_OFFSET_NV 0x907E
 5337+#define GL_PATH_CLIENT_LENGTH_NV 0x907F
 5338+#define GL_PATH_FILL_MODE_NV 0x9080
 5339+#define GL_PATH_FILL_MASK_NV 0x9081
 5340+#define GL_PATH_FILL_COVER_MODE_NV 0x9082
 5341+#define GL_PATH_STROKE_COVER_MODE_NV 0x9083
 5342+#define GL_PATH_STROKE_MASK_NV 0x9084
 5343+#define GL_PATH_SAMPLE_QUALITY_NV 0x9085
 5344+#define GL_PATH_STROKE_BOUND_NV 0x9086
 5345+#define GL_PATH_STROKE_OVERSAMPLE_COUNT_NV 0x9087
 5346+#define GL_COUNT_UP_NV 0x9088
 5347+#define GL_COUNT_DOWN_NV 0x9089
 5348+#define GL_PATH_OBJECT_BOUNDING_BOX_NV 0x908A
 5349+#define GL_CONVEX_HULL_NV 0x908B
 5350+#define GL_MULTI_HULLS_NV 0x908C
 5351+#define GL_BOUNDING_BOX_NV 0x908D
 5352+#define GL_TRANSLATE_X_NV 0x908E
 5353+#define GL_TRANSLATE_Y_NV 0x908F
 5354+#define GL_TRANSLATE_2D_NV 0x9090
 5355+#define GL_TRANSLATE_3D_NV 0x9091
 5356+#define GL_AFFINE_2D_NV 0x9092
 5357+#define GL_PROJECTIVE_2D_NV 0x9093
 5358+#define GL_AFFINE_3D_NV 0x9094
 5359+#define GL_PROJECTIVE_3D_NV 0x9095
 5360+#define GL_TRANSPOSE_AFFINE_2D_NV 0x9096
 5361+#define GL_TRANSPOSE_PROJECTIVE_2D_NV 0x9097
 5362+#define GL_TRANSPOSE_AFFINE_3D_NV 0x9098
 5363+#define GL_TRANSPOSE_PROJECTIVE_3D_NV 0x9099
 5364+#define GL_UTF8_NV 0x909A
 5365+#define GL_UTF16_NV 0x909B
 5366+#define GL_BOUNDING_BOX_OF_BOUNDING_BOXES_NV 0x909C
 5367+#define GL_PATH_COMMAND_COUNT_NV 0x909D
 5368+#define GL_PATH_COORD_COUNT_NV 0x909E
 5369+#define GL_PATH_DASH_ARRAY_COUNT_NV 0x909F
 5370+#define GL_PATH_COMPUTED_LENGTH_NV 0x90A0
 5371+#define GL_PATH_FILL_BOUNDING_BOX_NV 0x90A1
 5372+#define GL_PATH_STROKE_BOUNDING_BOX_NV 0x90A2
 5373+#define GL_SQUARE_NV 0x90A3
 5374+#define GL_ROUND_NV 0x90A4
 5375+#define GL_TRIANGULAR_NV 0x90A5
 5376+#define GL_BEVEL_NV 0x90A6
 5377+#define GL_MITER_REVERT_NV 0x90A7
 5378+#define GL_MITER_TRUNCATE_NV 0x90A8
 5379+#define GL_SKIP_MISSING_GLYPH_NV 0x90A9
 5380+#define GL_USE_MISSING_GLYPH_NV 0x90AA
 5381+#define GL_PATH_ERROR_POSITION_NV 0x90AB
 5382+#define GL_PATH_FOG_GEN_MODE_NV 0x90AC
 5383+#define GL_ACCUM_ADJACENT_PAIRS_NV 0x90AD
 5384+#define GL_ADJACENT_PAIRS_NV 0x90AE
 5385+#define GL_FIRST_TO_REST_NV 0x90AF
 5386+#define GL_PATH_GEN_MODE_NV 0x90B0
 5387+#define GL_PATH_GEN_COEFF_NV 0x90B1
 5388+#define GL_PATH_GEN_COLOR_FORMAT_NV 0x90B2
 5389+#define GL_PATH_GEN_COMPONENTS_NV 0x90B3
 5390+#define GL_PATH_STENCIL_FUNC_NV 0x90B7
 5391+#define GL_PATH_STENCIL_REF_NV 0x90B8
 5392+#define GL_PATH_STENCIL_VALUE_MASK_NV 0x90B9
 5393+#define GL_PATH_STENCIL_DEPTH_OFFSET_FACTOR_NV 0x90BD
 5394+#define GL_PATH_STENCIL_DEPTH_OFFSET_UNITS_NV 0x90BE
 5395+#define GL_PATH_COVER_DEPTH_FUNC_NV 0x90BF
 5396+#define GL_PATH_DASH_OFFSET_RESET_NV 0x90B4
 5397+#define GL_MOVE_TO_RESETS_NV 0x90B5
 5398+#define GL_MOVE_TO_CONTINUES_NV 0x90B6
 5399+#define GL_CLOSE_PATH_NV 0x00
 5400+#define GL_MOVE_TO_NV 0x02
 5401+#define GL_RELATIVE_MOVE_TO_NV 0x03
 5402+#define GL_LINE_TO_NV 0x04
 5403+#define GL_RELATIVE_LINE_TO_NV 0x05
 5404+#define GL_HORIZONTAL_LINE_TO_NV 0x06
 5405+#define GL_RELATIVE_HORIZONTAL_LINE_TO_NV 0x07
 5406+#define GL_VERTICAL_LINE_TO_NV 0x08
 5407+#define GL_RELATIVE_VERTICAL_LINE_TO_NV 0x09
 5408+#define GL_QUADRATIC_CURVE_TO_NV 0x0A
 5409+#define GL_RELATIVE_QUADRATIC_CURVE_TO_NV 0x0B
 5410+#define GL_CUBIC_CURVE_TO_NV 0x0C
 5411+#define GL_RELATIVE_CUBIC_CURVE_TO_NV 0x0D
 5412+#define GL_SMOOTH_QUADRATIC_CURVE_TO_NV 0x0E
 5413+#define GL_RELATIVE_SMOOTH_QUADRATIC_CURVE_TO_NV 0x0F
 5414+#define GL_SMOOTH_CUBIC_CURVE_TO_NV 0x10
 5415+#define GL_RELATIVE_SMOOTH_CUBIC_CURVE_TO_NV 0x11
 5416+#define GL_SMALL_CCW_ARC_TO_NV 0x12
 5417+#define GL_RELATIVE_SMALL_CCW_ARC_TO_NV 0x13
 5418+#define GL_SMALL_CW_ARC_TO_NV 0x14
 5419+#define GL_RELATIVE_SMALL_CW_ARC_TO_NV 0x15
 5420+#define GL_LARGE_CCW_ARC_TO_NV 0x16
 5421+#define GL_RELATIVE_LARGE_CCW_ARC_TO_NV 0x17
 5422+#define GL_LARGE_CW_ARC_TO_NV 0x18
 5423+#define GL_RELATIVE_LARGE_CW_ARC_TO_NV 0x19
 5424+#define GL_RESTART_PATH_NV 0xF0
 5425+#define GL_DUP_FIRST_CUBIC_CURVE_TO_NV 0xF2
 5426+#define GL_DUP_LAST_CUBIC_CURVE_TO_NV 0xF4
 5427+#define GL_RECT_NV 0xF6
 5428+#define GL_CIRCULAR_CCW_ARC_TO_NV 0xF8
 5429+#define GL_CIRCULAR_CW_ARC_TO_NV 0xFA
 5430+#define GL_CIRCULAR_TANGENT_ARC_TO_NV 0xFC
 5431+#define GL_ARC_TO_NV 0xFE
 5432+#define GL_RELATIVE_ARC_TO_NV 0xFF
 5433+#define GL_BOLD_BIT_NV 0x01
 5434+#define GL_ITALIC_BIT_NV 0x02
 5435+#define GL_GLYPH_WIDTH_BIT_NV 0x01
 5436+#define GL_GLYPH_HEIGHT_BIT_NV 0x02
 5437+#define GL_GLYPH_HORIZONTAL_BEARING_X_BIT_NV 0x04
 5438+#define GL_GLYPH_HORIZONTAL_BEARING_Y_BIT_NV 0x08
 5439+#define GL_GLYPH_HORIZONTAL_BEARING_ADVANCE_BIT_NV 0x10
 5440+#define GL_GLYPH_VERTICAL_BEARING_X_BIT_NV 0x20
 5441+#define GL_GLYPH_VERTICAL_BEARING_Y_BIT_NV 0x40
 5442+#define GL_GLYPH_VERTICAL_BEARING_ADVANCE_BIT_NV 0x80
 5443+#define GL_GLYPH_HAS_KERNING_NV 0x100
 5444+#define GL_FONT_X_MIN_BOUNDS_NV 0x00010000
 5445+#define GL_FONT_Y_MIN_BOUNDS_NV 0x00020000
 5446+#define GL_FONT_X_MAX_BOUNDS_NV 0x00040000
 5447+#define GL_FONT_Y_MAX_BOUNDS_NV 0x00080000
 5448+#define GL_FONT_UNITS_PER_EM_NV 0x00100000
 5449+#define GL_FONT_ASCENDER_NV 0x00200000
 5450+#define GL_FONT_DESCENDER_NV 0x00400000
 5451+#define GL_FONT_HEIGHT_NV 0x00800000
 5452+#define GL_FONT_MAX_ADVANCE_WIDTH_NV 0x01000000
 5453+#define GL_FONT_MAX_ADVANCE_HEIGHT_NV 0x02000000
 5454+#define GL_FONT_UNDERLINE_POSITION_NV 0x04000000
 5455+#define GL_FONT_UNDERLINE_THICKNESS_NV 0x08000000
 5456+#define GL_FONT_HAS_KERNING_NV 0x10000000
 5457+#endif
 5458+
53155459 #ifndef GL_AMD_pinned_memory
53165460 #define GL_EXTERNAL_VIRTUAL_MEMORY_BUFFER_AMD 0x9160
53175461 #endif
53185462
 5463+#ifndef GL_AMD_stencil_operation_extended
 5464+#define GL_SET_AMD 0x874A
 5465+#define GL_REPLACE_VALUE_AMD 0x874B
 5466+#define GL_STENCIL_OP_VALUE_AMD 0x874C
 5467+#define GL_STENCIL_BACK_OP_VALUE_AMD 0x874D
 5468+#endif
53195469
 5470+#ifndef GL_AMD_vertex_shader_viewport_index
 5471+#endif
 5472+
 5473+#ifndef GL_AMD_vertex_shader_layer
 5474+#endif
 5475+
 5476+#ifndef GL_NV_bindless_texture
 5477+#endif
 5478+
 5479+#ifndef GL_NV_shader_atomic_float
 5480+#endif
 5481+
 5482+
53205483 /*************************************************************/
53215484
53225485 #include <stddef.h>
——@@ -5421,7 +5584,7 @@
54225585 #ifndef GL_VERSION_1_2
54235586 #define GL_VERSION_1_2 1
54245587 #ifdef GL_GLEXT_PROTOTYPES
5425 -GLAPI void APIENTRY glBlendColor (GLclampf red, GLclampf green, GLclampf blue, GLclampf alpha);
 5588+GLAPI void APIENTRY glBlendColor (GLfloat red, GLfloat green, GLfloat blue, GLfloat alpha);
54265589 GLAPI void APIENTRY glBlendEquation (GLenum mode);
54275590 GLAPI void APIENTRY glDrawRangeElements (GLenum mode, GLuint start, GLuint end, GLsizei count, GLenum type, const GLvoid *indices);
54285591 GLAPI void APIENTRY glTexImage3D (GLenum target, GLint level, GLint internalformat, GLsizei width, GLsizei height, GLsizei depth, GLint border, GLenum format, GLenum type, const GLvoid *pixels);
——@@ -5428,7 +5591,7 @@
54295592 GLAPI void APIENTRY glTexSubImage3D (GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLsizei width, GLsizei height, GLsizei depth, GLenum format, GLenum type, const GLvoid *pixels);
54305593 GLAPI void APIENTRY glCopyTexSubImage3D (GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLint x, GLint y, GLsizei width, GLsizei height);
54315594 #endif /* GL_GLEXT_PROTOTYPES */
5432 -typedef void (APIENTRYP PFNGLBLENDCOLORPROC) (GLclampf red, GLclampf green, GLclampf blue, GLclampf alpha);
 5595+typedef void (APIENTRYP PFNGLBLENDCOLORPROC) (GLfloat red, GLfloat green, GLfloat blue, GLfloat alpha);
54335596 typedef void (APIENTRYP PFNGLBLENDEQUATIONPROC) (GLenum mode);
54345597 typedef void (APIENTRYP PFNGLDRAWRANGEELEMENTSPROC) (GLenum mode, GLuint start, GLuint end, GLsizei count, GLenum type, const GLvoid *indices);
54355598 typedef void (APIENTRYP PFNGLTEXIMAGE3DPROC) (GLenum target, GLint level, GLint internalformat, GLsizei width, GLsizei height, GLsizei depth, GLint border, GLenum format, GLenum type, const GLvoid *pixels);
——@@ -5510,7 +5673,7 @@
55115674 #define GL_VERSION_1_3 1
55125675 #ifdef GL_GLEXT_PROTOTYPES
55135676 GLAPI void APIENTRY glActiveTexture (GLenum texture);
5514 -GLAPI void APIENTRY glSampleCoverage (GLclampf value, GLboolean invert);
 5677+GLAPI void APIENTRY glSampleCoverage (GLfloat value, GLboolean invert);
55155678 GLAPI void APIENTRY glCompressedTexImage3D (GLenum target, GLint level, GLenum internalformat, GLsizei width, GLsizei height, GLsizei depth, GLint border, GLsizei imageSize, const GLvoid *data);
55165679 GLAPI void APIENTRY glCompressedTexImage2D (GLenum target, GLint level, GLenum internalformat, GLsizei width, GLsizei height, GLint border, GLsizei imageSize, const GLvoid *data);
55175680 GLAPI void APIENTRY glCompressedTexImage1D (GLenum target, GLint level, GLenum internalformat, GLsizei width, GLint border, GLsizei imageSize, const GLvoid *data);
——@@ -5520,7 +5683,7 @@
55215684 GLAPI void APIENTRY glGetCompressedTexImage (GLenum target, GLint level, GLvoid *img);
55225685 #endif /* GL_GLEXT_PROTOTYPES */
55235686 typedef void (APIENTRYP PFNGLACTIVETEXTUREPROC) (GLenum texture);
5524 -typedef void (APIENTRYP PFNGLSAMPLECOVERAGEPROC) (GLclampf value, GLboolean invert);
 5687+typedef void (APIENTRYP PFNGLSAMPLECOVERAGEPROC) (GLfloat value, GLboolean invert);
55255688 typedef void (APIENTRYP PFNGLCOMPRESSEDTEXIMAGE3DPROC) (GLenum target, GLint level, GLenum internalformat, GLsizei width, GLsizei height, GLsizei depth, GLint border, GLsizei imageSize, const GLvoid *data);
55265689 typedef void (APIENTRYP PFNGLCOMPRESSEDTEXIMAGE2DPROC) (GLenum target, GLint level, GLenum internalformat, GLsizei width, GLsizei height, GLint border, GLsizei imageSize, const GLvoid *data);
55275690 typedef void (APIENTRYP PFNGLCOMPRESSEDTEXIMAGE1DPROC) (GLenum target, GLint level, GLenum internalformat, GLsizei width, GLint border, GLsizei imageSize, const GLvoid *data);
——@@ -5615,7 +5778,7 @@
56165779 #ifdef GL_GLEXT_PROTOTYPES
56175780 GLAPI void APIENTRY glBlendFuncSeparate (GLenum sfactorRGB, GLenum dfactorRGB, GLenum sfactorAlpha, GLenum dfactorAlpha);
56185781 GLAPI void APIENTRY glMultiDrawArrays (GLenum mode, const GLint *first, const GLsizei *count, GLsizei primcount);
5619 -GLAPI void APIENTRY glMultiDrawElements (GLenum mode, const GLsizei *count, GLenum type, const GLvoid* *indices, GLsizei primcount);
 5782+GLAPI void APIENTRY glMultiDrawElements (GLenum mode, const GLsizei *count, GLenum type, const GLvoid* const *indices, GLsizei primcount);
56205783 GLAPI void APIENTRY glPointParameterf (GLenum pname, GLfloat param);
56215784 GLAPI void APIENTRY glPointParameterfv (GLenum pname, const GLfloat *params);
56225785 GLAPI void APIENTRY glPointParameteri (GLenum pname, GLint param);
——@@ -5623,7 +5786,7 @@
56245787 #endif /* GL_GLEXT_PROTOTYPES */
56255788 typedef void (APIENTRYP PFNGLBLENDFUNCSEPARATEPROC) (GLenum sfactorRGB, GLenum dfactorRGB, GLenum sfactorAlpha, GLenum dfactorAlpha);
56265789 typedef void (APIENTRYP PFNGLMULTIDRAWARRAYSPROC) (GLenum mode, const GLint *first, const GLsizei *count, GLsizei primcount);
5627 -typedef void (APIENTRYP PFNGLMULTIDRAWELEMENTSPROC) (GLenum mode, const GLsizei *count, GLenum type, const GLvoid* *indices, GLsizei primcount);
 5790+typedef void (APIENTRYP PFNGLMULTIDRAWELEMENTSPROC) (GLenum mode, const GLsizei *count, GLenum type, const GLvoid* const *indices, GLsizei primcount);
56285791 typedef void (APIENTRYP PFNGLPOINTPARAMETERFPROC) (GLenum pname, GLfloat param);
56295792 typedef void (APIENTRYP PFNGLPOINTPARAMETERFVPROC) (GLenum pname, const GLfloat *params);
56305793 typedef void (APIENTRYP PFNGLPOINTPARAMETERIPROC) (GLenum pname, GLint param);
——@@ -5793,7 +5956,7 @@
57945957 GLAPI GLboolean APIENTRY glIsProgram (GLuint program);
57955958 GLAPI GLboolean APIENTRY glIsShader (GLuint shader);
57965959 GLAPI void APIENTRY glLinkProgram (GLuint program);
5797 -GLAPI void APIENTRY glShaderSource (GLuint shader, GLsizei count, const GLchar* *string, const GLint *length);
 5960+GLAPI void APIENTRY glShaderSource (GLuint shader, GLsizei count, const GLchar* const *string, const GLint *length);
57985961 GLAPI void APIENTRY glUseProgram (GLuint program);
57995962 GLAPI void APIENTRY glUniform1f (GLint location, GLfloat v0);
58005963 GLAPI void APIENTRY glUniform2f (GLint location, GLfloat v0, GLfloat v1);
——@@ -5887,7 +6050,7 @@
58886051 typedef GLboolean (APIENTRYP PFNGLISPROGRAMPROC) (GLuint program);
58896052 typedef GLboolean (APIENTRYP PFNGLISSHADERPROC) (GLuint shader);
58906053 typedef void (APIENTRYP PFNGLLINKPROGRAMPROC) (GLuint program);
5891 -typedef void (APIENTRYP PFNGLSHADERSOURCEPROC) (GLuint shader, GLsizei count, const GLchar* *string, const GLint *length);
 6054+typedef void (APIENTRYP PFNGLSHADERSOURCEPROC) (GLuint shader, GLsizei count, const GLchar* const *string, const GLint *length);
58926055 typedef void (APIENTRYP PFNGLUSEPROGRAMPROC) (GLuint program);
58936056 typedef void (APIENTRYP PFNGLUNIFORM1FPROC) (GLint location, GLfloat v0);
58946057 typedef void (APIENTRYP PFNGLUNIFORM2FPROC) (GLint location, GLfloat v0, GLfloat v1);
——@@ -5983,7 +6146,7 @@
59846147 GLAPI void APIENTRY glEndTransformFeedback (void);
59856148 GLAPI void APIENTRY glBindBufferRange (GLenum target, GLuint index, GLuint buffer, GLintptr offset, GLsizeiptr size);
59866149 GLAPI void APIENTRY glBindBufferBase (GLenum target, GLuint index, GLuint buffer);
5987 -GLAPI void APIENTRY glTransformFeedbackVaryings (GLuint program, GLsizei count, const GLchar* *varyings, GLenum bufferMode);
 6150+GLAPI void APIENTRY glTransformFeedbackVaryings (GLuint program, GLsizei count, const GLchar* const *varyings, GLenum bufferMode);
59886151 GLAPI void APIENTRY glGetTransformFeedbackVarying (GLuint program, GLuint index, GLsizei bufSize, GLsizei *length, GLsizei *size, GLenum *type, GLchar *name);
59896152 GLAPI void APIENTRY glClampColor (GLenum target, GLenum clamp);
59906153 GLAPI void APIENTRY glBeginConditionalRender (GLuint id, GLenum mode);
——@@ -6042,7 +6205,7 @@
60436206 typedef void (APIENTRYP PFNGLENDTRANSFORMFEEDBACKPROC) (void);
60446207 typedef void (APIENTRYP PFNGLBINDBUFFERRANGEPROC) (GLenum target, GLuint index, GLuint buffer, GLintptr offset, GLsizeiptr size);
60456208 typedef void (APIENTRYP PFNGLBINDBUFFERBASEPROC) (GLenum target, GLuint index, GLuint buffer);
6046 -typedef void (APIENTRYP PFNGLTRANSFORMFEEDBACKVARYINGSPROC) (GLuint program, GLsizei count, const GLchar* *varyings, GLenum bufferMode);
 6209+typedef void (APIENTRYP PFNGLTRANSFORMFEEDBACKVARYINGSPROC) (GLuint program, GLsizei count, const GLchar* const *varyings, GLenum bufferMode);
60476210 typedef void (APIENTRYP PFNGLGETTRANSFORMFEEDBACKVARYINGPROC) (GLuint program, GLuint index, GLsizei bufSize, GLsizei *length, GLsizei *size, GLenum *type, GLchar *name);
60486211 typedef void (APIENTRYP PFNGLCLAMPCOLORPROC) (GLenum target, GLenum clamp);
60496212 typedef void (APIENTRYP PFNGLBEGINCONDITIONALRENDERPROC) (GLuint id, GLenum mode);
——@@ -6159,13 +6322,13 @@
61606323 /* ARB_transform_feedback2 */
61616324 /* ARB_transform_feedback3 */
61626325 #ifdef GL_GLEXT_PROTOTYPES
6163 -GLAPI void APIENTRY glMinSampleShading (GLclampf value);
 6326+GLAPI void APIENTRY glMinSampleShading (GLfloat value);
61646327 GLAPI void APIENTRY glBlendEquationi (GLuint buf, GLenum mode);
61656328 GLAPI void APIENTRY glBlendEquationSeparatei (GLuint buf, GLenum modeRGB, GLenum modeAlpha);
61666329 GLAPI void APIENTRY glBlendFunci (GLuint buf, GLenum src, GLenum dst);
61676330 GLAPI void APIENTRY glBlendFuncSeparatei (GLuint buf, GLenum srcRGB, GLenum dstRGB, GLenum srcAlpha, GLenum dstAlpha);
61686331 #endif /* GL_GLEXT_PROTOTYPES */
6169 -typedef void (APIENTRYP PFNGLMINSAMPLESHADINGPROC) (GLclampf value);
 6332+typedef void (APIENTRYP PFNGLMINSAMPLESHADINGPROC) (GLfloat value);
61706333 typedef void (APIENTRYP PFNGLBLENDEQUATIONIPROC) (GLuint buf, GLenum mode);
61716334 typedef void (APIENTRYP PFNGLBLENDEQUATIONSEPARATEIPROC) (GLuint buf, GLenum modeRGB, GLenum modeAlpha);
61726335 typedef void (APIENTRYP PFNGLBLENDFUNCIPROC) (GLuint buf, GLenum src, GLenum dst);
——@@ -6290,9 +6453,9 @@
62916454 #ifndef GL_ARB_multisample
62926455 #define GL_ARB_multisample 1
62936456 #ifdef GL_GLEXT_PROTOTYPES
6294 -GLAPI void APIENTRY glSampleCoverageARB (GLclampf value, GLboolean invert);
 6457+GLAPI void APIENTRY glSampleCoverageARB (GLfloat value, GLboolean invert);
62956458 #endif /* GL_GLEXT_PROTOTYPES */
6296 -typedef void (APIENTRYP PFNGLSAMPLECOVERAGEARBPROC) (GLclampf value, GLboolean invert);
 6459+typedef void (APIENTRYP PFNGLSAMPLECOVERAGEARBPROC) (GLfloat value, GLboolean invert);
62976460 #endif
62986461
62996462 #ifndef GL_ARB_texture_env_add
——@@ -6911,7 +7074,7 @@
69127075 #ifndef GL_ARB_uniform_buffer_object
69137076 #define GL_ARB_uniform_buffer_object 1
69147077 #ifdef GL_GLEXT_PROTOTYPES
6915 -GLAPI void APIENTRY glGetUniformIndices (GLuint program, GLsizei uniformCount, const GLchar* *uniformNames, GLuint *uniformIndices);
 7078+GLAPI void APIENTRY glGetUniformIndices (GLuint program, GLsizei uniformCount, const GLchar* const *uniformNames, GLuint *uniformIndices);
69167079 GLAPI void APIENTRY glGetActiveUniformsiv (GLuint program, GLsizei uniformCount, const GLuint *uniformIndices, GLenum pname, GLint *params);
69177080 GLAPI void APIENTRY glGetActiveUniformName (GLuint program, GLuint uniformIndex, GLsizei bufSize, GLsizei *length, GLchar *uniformName);
69187081 GLAPI GLuint APIENTRY glGetUniformBlockIndex (GLuint program, const GLchar *uniformBlockName);
——@@ -6919,7 +7082,7 @@
69207083 GLAPI void APIENTRY glGetActiveUniformBlockName (GLuint program, GLuint uniformBlockIndex, GLsizei bufSize, GLsizei *length, GLchar *uniformBlockName);
69217084 GLAPI void APIENTRY glUniformBlockBinding (GLuint program, GLuint uniformBlockIndex, GLuint uniformBlockBinding);
69227085 #endif /* GL_GLEXT_PROTOTYPES */
6923 -typedef void (APIENTRYP PFNGLGETUNIFORMINDICESPROC) (GLuint program, GLsizei uniformCount, const GLchar* *uniformNames, GLuint *uniformIndices);
 7086+typedef void (APIENTRYP PFNGLGETUNIFORMINDICESPROC) (GLuint program, GLsizei uniformCount, const GLchar* const *uniformNames, GLuint *uniformIndices);
69247087 typedef void (APIENTRYP PFNGLGETACTIVEUNIFORMSIVPROC) (GLuint program, GLsizei uniformCount, const GLuint *uniformIndices, GLenum pname, GLint *params);
69257088 typedef void (APIENTRYP PFNGLGETACTIVEUNIFORMNAMEPROC) (GLuint program, GLuint uniformIndex, GLsizei bufSize, GLsizei *length, GLchar *uniformName);
69267089 typedef GLuint (APIENTRYP PFNGLGETUNIFORMBLOCKINDEXPROC) (GLuint program, const GLchar *uniformBlockName);
——@@ -6954,12 +7117,12 @@
69557118 GLAPI void APIENTRY glDrawElementsBaseVertex (GLenum mode, GLsizei count, GLenum type, const GLvoid *indices, GLint basevertex);
69567119 GLAPI void APIENTRY glDrawRangeElementsBaseVertex (GLenum mode, GLuint start, GLuint end, GLsizei count, GLenum type, const GLvoid *indices, GLint basevertex);
69577120 GLAPI void APIENTRY glDrawElementsInstancedBaseVertex (GLenum mode, GLsizei count, GLenum type, const GLvoid *indices, GLsizei primcount, GLint basevertex);
6958 -GLAPI void APIENTRY glMultiDrawElementsBaseVertex (GLenum mode, const GLsizei *count, GLenum type, const GLvoid* *indices, GLsizei primcount, const GLint *basevertex);
 7121+GLAPI void APIENTRY glMultiDrawElementsBaseVertex (GLenum mode, const GLsizei *count, GLenum type, const GLvoid* const *indices, GLsizei primcount, const GLint *basevertex);
69597122 #endif /* GL_GLEXT_PROTOTYPES */
69607123 typedef void (APIENTRYP PFNGLDRAWELEMENTSBASEVERTEXPROC) (GLenum mode, GLsizei count, GLenum type, const GLvoid *indices, GLint basevertex);
69617124 typedef void (APIENTRYP PFNGLDRAWRANGEELEMENTSBASEVERTEXPROC) (GLenum mode, GLuint start, GLuint end, GLsizei count, GLenum type, const GLvoid *indices, GLint basevertex);
69627125 typedef void (APIENTRYP PFNGLDRAWELEMENTSINSTANCEDBASEVERTEXPROC) (GLenum mode, GLsizei count, GLenum type, const GLvoid *indices, GLsizei primcount, GLint basevertex);
6963 -typedef void (APIENTRYP PFNGLMULTIDRAWELEMENTSBASEVERTEXPROC) (GLenum mode, const GLsizei *count, GLenum type, const GLvoid* *indices, GLsizei primcount, const GLint *basevertex);
 7126+typedef void (APIENTRYP PFNGLMULTIDRAWELEMENTSBASEVERTEXPROC) (GLenum mode, const GLsizei *count, GLenum type, const GLvoid* const *indices, GLsizei primcount, const GLint *basevertex);
69647127 #endif
69657128
69667129 #ifndef GL_ARB_fragment_coord_conventions
——@@ -7033,9 +7196,9 @@
70347197 #ifndef GL_ARB_sample_shading
70357198 #define GL_ARB_sample_shading 1
70367199 #ifdef GL_GLEXT_PROTOTYPES
7037 -GLAPI void APIENTRY glMinSampleShadingARB (GLclampf value);
 7200+GLAPI void APIENTRY glMinSampleShadingARB (GLfloat value);
70387201 #endif /* GL_GLEXT_PROTOTYPES */
7039 -typedef void (APIENTRYP PFNGLMINSAMPLESHADINGARBPROC) (GLclampf value);
 7202+typedef void (APIENTRYP PFNGLMINSAMPLESHADINGARBPROC) (GLfloat value);
70407203 #endif
70417204
70427205 #ifndef GL_ARB_texture_cube_map_array
——@@ -7362,14 +7525,14 @@
73637526 GLAPI void APIENTRY glReleaseShaderCompiler (void);
73647527 GLAPI void APIENTRY glShaderBinary (GLsizei count, const GLuint *shaders, GLenum binaryformat, const GLvoid *binary, GLsizei length);
73657528 GLAPI void APIENTRY glGetShaderPrecisionFormat (GLenum shadertype, GLenum precisiontype, GLint *range, GLint *precision);
7366 -GLAPI void APIENTRY glDepthRangef (GLclampf n, GLclampf f);
7367 -GLAPI void APIENTRY glClearDepthf (GLclampf d);
 7529+GLAPI void APIENTRY glDepthRangef (GLfloat n, GLfloat f);
 7530+GLAPI void APIENTRY glClearDepthf (GLfloat d);
73687531 #endif /* GL_GLEXT_PROTOTYPES */
73697532 typedef void (APIENTRYP PFNGLRELEASESHADERCOMPILERPROC) (void);
73707533 typedef void (APIENTRYP PFNGLSHADERBINARYPROC) (GLsizei count, const GLuint *shaders, GLenum binaryformat, const GLvoid *binary, GLsizei length);
73717534 typedef void (APIENTRYP PFNGLGETSHADERPRECISIONFORMATPROC) (GLenum shadertype, GLenum precisiontype, GLint *range, GLint *precision);
7372 -typedef void (APIENTRYP PFNGLDEPTHRANGEFPROC) (GLclampf n, GLclampf f);
7373 -typedef void (APIENTRYP PFNGLCLEARDEPTHFPROC) (GLclampf d);
 7535+typedef void (APIENTRYP PFNGLDEPTHRANGEFPROC) (GLfloat n, GLfloat f);
 7536+typedef void (APIENTRYP PFNGLCLEARDEPTHFPROC) (GLfloat d);
73747537 #endif
73757538
73767539 #ifndef GL_ARB_get_program_binary
——@@ -7389,7 +7552,7 @@
73907553 #ifdef GL_GLEXT_PROTOTYPES
73917554 GLAPI void APIENTRY glUseProgramStages (GLuint pipeline, GLbitfield stages, GLuint program);
73927555 GLAPI void APIENTRY glActiveShaderProgram (GLuint pipeline, GLuint program);
7393 -GLAPI GLuint APIENTRY glCreateShaderProgramv (GLenum type, GLsizei count, const GLchar* *strings);
 7556+GLAPI GLuint APIENTRY glCreateShaderProgramv (GLenum type, GLsizei count, const GLchar* const *strings);
73947557 GLAPI void APIENTRY glBindProgramPipeline (GLuint pipeline);
73957558 GLAPI void APIENTRY glDeleteProgramPipelines (GLsizei n, const GLuint *pipelines);
73967559 GLAPI void APIENTRY glGenProgramPipelines (GLsizei n, GLuint *pipelines);
——@@ -7450,7 +7613,7 @@
74517614 #endif /* GL_GLEXT_PROTOTYPES */
74527615 typedef void (APIENTRYP PFNGLUSEPROGRAMSTAGESPROC) (GLuint pipeline, GLbitfield stages, GLuint program);
74537616 typedef void (APIENTRYP PFNGLACTIVESHADERPROGRAMPROC) (GLuint pipeline, GLuint program);
7454 -typedef GLuint (APIENTRYP PFNGLCREATESHADERPROGRAMVPROC) (GLenum type, GLsizei count, const GLchar* *strings);
 7617+typedef GLuint (APIENTRYP PFNGLCREATESHADERPROGRAMVPROC) (GLenum type, GLsizei count, const GLchar* const *strings);
74557618 typedef void (APIENTRYP PFNGLBINDPROGRAMPIPELINEPROC) (GLuint pipeline);
74567619 typedef void (APIENTRYP PFNGLDELETEPROGRAMPIPELINESPROC) (GLsizei n, const GLuint *pipelines);
74577620 typedef void (APIENTRYP PFNGLGENPROGRAMPIPELINESPROC) (GLsizei n, GLuint *pipelines);
——@@ -7545,8 +7708,8 @@
75467709 GLAPI void APIENTRY glScissorArrayv (GLuint first, GLsizei count, const GLint *v);
75477710 GLAPI void APIENTRY glScissorIndexed (GLuint index, GLint left, GLint bottom, GLsizei width, GLsizei height);
75487711 GLAPI void APIENTRY glScissorIndexedv (GLuint index, const GLint *v);
7549 -GLAPI void APIENTRY glDepthRangeArrayv (GLuint first, GLsizei count, const GLclampd *v);
7550 -GLAPI void APIENTRY glDepthRangeIndexed (GLuint index, GLclampd n, GLclampd f);
 7712+GLAPI void APIENTRY glDepthRangeArrayv (GLuint first, GLsizei count, const GLdouble *v);
 7713+GLAPI void APIENTRY glDepthRangeIndexed (GLuint index, GLdouble n, GLdouble f);
75517714 GLAPI void APIENTRY glGetFloati_v (GLenum target, GLuint index, GLfloat *data);
75527715 GLAPI void APIENTRY glGetDoublei_v (GLenum target, GLuint index, GLdouble *data);
75537716 #endif /* GL_GLEXT_PROTOTYPES */
——@@ -7556,8 +7719,8 @@
75577720 typedef void (APIENTRYP PFNGLSCISSORARRAYVPROC) (GLuint first, GLsizei count, const GLint *v);
75587721 typedef void (APIENTRYP PFNGLSCISSORINDEXEDPROC) (GLuint index, GLint left, GLint bottom, GLsizei width, GLsizei height);
75597722 typedef void (APIENTRYP PFNGLSCISSORINDEXEDVPROC) (GLuint index, const GLint *v);
7560 -typedef void (APIENTRYP PFNGLDEPTHRANGEARRAYVPROC) (GLuint first, GLsizei count, const GLclampd *v);
7561 -typedef void (APIENTRYP PFNGLDEPTHRANGEINDEXEDPROC) (GLuint index, GLclampd n, GLclampd f);
 7723+typedef void (APIENTRYP PFNGLDEPTHRANGEARRAYVPROC) (GLuint first, GLsizei count, const GLdouble *v);
 7724+typedef void (APIENTRYP PFNGLDEPTHRANGEINDEXEDPROC) (GLuint index, GLdouble n, GLdouble f);
75627725 typedef void (APIENTRYP PFNGLGETFLOATI_VPROC) (GLenum target, GLuint index, GLfloat *data);
75637726 typedef void (APIENTRYP PFNGLGETDOUBLEI_VPROC) (GLenum target, GLuint index, GLdouble *data);
75647727 #endif
——@@ -7727,9 +7890,9 @@
77287891 #ifndef GL_EXT_blend_color
77297892 #define GL_EXT_blend_color 1
77307893 #ifdef GL_GLEXT_PROTOTYPES
7731 -GLAPI void APIENTRY glBlendColorEXT (GLclampf red, GLclampf green, GLclampf blue, GLclampf alpha);
 7894+GLAPI void APIENTRY glBlendColorEXT (GLfloat red, GLfloat green, GLfloat blue, GLfloat alpha);
77327895 #endif /* GL_GLEXT_PROTOTYPES */
7733 -typedef void (APIENTRYP PFNGLBLENDCOLOREXTPROC) (GLclampf red, GLclampf green, GLclampf blue, GLclampf alpha);
 7896+typedef void (APIENTRYP PFNGLBLENDCOLOREXTPROC) (GLfloat red, GLfloat green, GLfloat blue, GLfloat alpha);
77347897 #endif
77357898
77367899 #ifndef GL_EXT_polygon_offset
——@@ -11482,11 +11645,167 @@
1148311646 #define GL_EXT_framebuffer_multisample_blit_scaled 1
1148411647 #endif
1148511648
 11649+#ifndef GL_NV_path_rendering
 11650+#define GL_NV_path_rendering 1
 11651+#ifdef GL_GLEXT_PROTOTYPES
 11652+GLAPI GLuint APIENTRY glGenPathsNV (GLsizei range);
 11653+GLAPI void APIENTRY glDeletePathsNV (GLuint path, GLsizei range);
 11654+GLAPI GLboolean APIENTRY glIsPathNV (GLuint path);
 11655+GLAPI void APIENTRY glPathCommandsNV (GLuint path, GLsizei numCommands, const GLubyte *commands, GLsizei numCoords, GLenum coordType, const GLvoid *coords);
 11656+GLAPI void APIENTRY glPathCoordsNV (GLuint path, GLsizei numCoords, GLenum coordType, const GLvoid *coords);
 11657+GLAPI void APIENTRY glPathSubCommandsNV (GLuint path, GLsizei commandStart, GLsizei commandsToDelete, GLsizei numCommands, const GLubyte *commands, GLsizei numCoords, GLenum coordType, const GLvoid *coords);
 11658+GLAPI void APIENTRY glPathSubCoordsNV (GLuint path, GLsizei coordStart, GLsizei numCoords, GLenum coordType, const GLvoid *coords);
 11659+GLAPI void APIENTRY glPathStringNV (GLuint path, GLenum format, GLsizei length, const GLvoid *pathString);
 11660+GLAPI void APIENTRY glPathGlyphsNV (GLuint firstPathName, GLenum fontTarget, const GLvoid *fontName, GLbitfield fontStyle, GLsizei numGlyphs, GLenum type, const GLvoid *charcodes, GLenum handleMissingGlyphs, GLuint pathParameterTemplate, GLfloat emScale);
 11661+GLAPI void APIENTRY glPathGlyphRangeNV (GLuint firstPathName, GLenum fontTarget, const GLvoid *fontName, GLbitfield fontStyle, GLuint firstGlyph, GLsizei numGlyphs, GLenum handleMissingGlyphs, GLuint pathParameterTemplate, GLfloat emScale);
 11662+GLAPI void APIENTRY glWeightPathsNV (GLuint resultPath, GLsizei numPaths, const GLuint *paths, const GLfloat *weights);
 11663+GLAPI void APIENTRY glCopyPathNV (GLuint resultPath, GLuint srcPath);
 11664+GLAPI void APIENTRY glInterpolatePathsNV (GLuint resultPath, GLuint pathA, GLuint pathB, GLfloat weight);
 11665+GLAPI void APIENTRY glTransformPathNV (GLuint resultPath, GLuint srcPath, GLenum transformType, const GLfloat *transformValues);
 11666+GLAPI void APIENTRY glPathParameterivNV (GLuint path, GLenum pname, const GLint *value);
 11667+GLAPI void APIENTRY glPathParameteriNV (GLuint path, GLenum pname, GLint value);
 11668+GLAPI void APIENTRY glPathParameterfvNV (GLuint path, GLenum pname, const GLfloat *value);
 11669+GLAPI void APIENTRY glPathParameterfNV (GLuint path, GLenum pname, GLfloat value);
 11670+GLAPI void APIENTRY glPathDashArrayNV (GLuint path, GLsizei dashCount, const GLfloat *dashArray);
 11671+GLAPI void APIENTRY glPathStencilFuncNV (GLenum func, GLint ref, GLuint mask);
 11672+GLAPI void APIENTRY glPathStencilDepthOffsetNV (GLfloat factor, GLfloat units);
 11673+GLAPI void APIENTRY glStencilFillPathNV (GLuint path, GLenum fillMode, GLuint mask);
 11674+GLAPI void APIENTRY glStencilStrokePathNV (GLuint path, GLint reference, GLuint mask);
 11675+GLAPI void APIENTRY glStencilFillPathInstancedNV (GLsizei numPaths, GLenum pathNameType, const GLvoid *paths, GLuint pathBase, GLenum fillMode, GLuint mask, GLenum transformType, const GLfloat *transformValues);
 11676+GLAPI void APIENTRY glStencilStrokePathInstancedNV (GLsizei numPaths, GLenum pathNameType, const GLvoid *paths, GLuint pathBase, GLint reference, GLuint mask, GLenum transformType, const GLfloat *transformValues);
 11677+GLAPI void APIENTRY glPathCoverDepthFuncNV (GLenum func);
 11678+GLAPI void APIENTRY glPathColorGenNV (GLenum color, GLenum genMode, GLenum colorFormat, const GLfloat *coeffs);
 11679+GLAPI void APIENTRY glPathTexGenNV (GLenum texCoordSet, GLenum genMode, GLint components, const GLfloat *coeffs);
 11680+GLAPI void APIENTRY glPathFogGenNV (GLenum genMode);
 11681+GLAPI void APIENTRY glCoverFillPathNV (GLuint path, GLenum coverMode);
 11682+GLAPI void APIENTRY glCoverStrokePathNV (GLuint path, GLenum coverMode);
 11683+GLAPI void APIENTRY glCoverFillPathInstancedNV (GLsizei numPaths, GLenum pathNameType, const GLvoid *paths, GLuint pathBase, GLenum coverMode, GLenum transformType, const GLfloat *transformValues);
 11684+GLAPI void APIENTRY glCoverStrokePathInstancedNV (GLsizei numPaths, GLenum pathNameType, const GLvoid *paths, GLuint pathBase, GLenum coverMode, GLenum transformType, const GLfloat *transformValues);
 11685+GLAPI void APIENTRY glGetPathParameterivNV (GLuint path, GLenum pname, GLint *value);
 11686+GLAPI void APIENTRY glGetPathParameterfvNV (GLuint path, GLenum pname, GLfloat *value);
 11687+GLAPI void APIENTRY glGetPathCommandsNV (GLuint path, GLubyte *commands);
 11688+GLAPI void APIENTRY glGetPathCoordsNV (GLuint path, GLfloat *coords);
 11689+GLAPI void APIENTRY glGetPathDashArrayNV (GLuint path, GLfloat *dashArray);
 11690+GLAPI void APIENTRY glGetPathMetricsNV (GLbitfield metricQueryMask, GLsizei numPaths, GLenum pathNameType, const GLvoid *paths, GLuint pathBase, GLsizei stride, GLfloat *metrics);
 11691+GLAPI void APIENTRY glGetPathMetricRangeNV (GLbitfield metricQueryMask, GLuint firstPathName, GLsizei numPaths, GLsizei stride, GLfloat *metrics);
 11692+GLAPI void APIENTRY glGetPathSpacingNV (GLenum pathListMode, GLsizei numPaths, GLenum pathNameType, const GLvoid *paths, GLuint pathBase, GLfloat advanceScale, GLfloat kerningScale, GLenum transformType, GLfloat *returnedSpacing);
 11693+GLAPI void APIENTRY glGetPathColorGenivNV (GLenum color, GLenum pname, GLint *value);
 11694+GLAPI void APIENTRY glGetPathColorGenfvNV (GLenum color, GLenum pname, GLfloat *value);
 11695+GLAPI void APIENTRY glGetPathTexGenivNV (GLenum texCoordSet, GLenum pname, GLint *value);
 11696+GLAPI void APIENTRY glGetPathTexGenfvNV (GLenum texCoordSet, GLenum pname, GLfloat *value);
 11697+GLAPI GLboolean APIENTRY glIsPointInFillPathNV (GLuint path, GLuint mask, GLfloat x, GLfloat y);
 11698+GLAPI GLboolean APIENTRY glIsPointInStrokePathNV (GLuint path, GLfloat x, GLfloat y);
 11699+GLAPI GLfloat APIENTRY glGetPathLengthNV (GLuint path, GLsizei startSegment, GLsizei numSegments);
 11700+GLAPI GLboolean APIENTRY glPointAlongPathNV (GLuint path, GLsizei startSegment, GLsizei numSegments, GLfloat distance, GLfloat *x, GLfloat *y, GLfloat *tangentX, GLfloat *tangentY);
 11701+#endif /* GL_GLEXT_PROTOTYPES */
 11702+typedef GLuint (APIENTRYP PFNGLGENPATHSNVPROC) (GLsizei range);
 11703+typedef void (APIENTRYP PFNGLDELETEPATHSNVPROC) (GLuint path, GLsizei range);
 11704+typedef GLboolean (APIENTRYP PFNGLISPATHNVPROC) (GLuint path);
 11705+typedef void (APIENTRYP PFNGLPATHCOMMANDSNVPROC) (GLuint path, GLsizei numCommands, const GLubyte *commands, GLsizei numCoords, GLenum coordType, const GLvoid *coords);
 11706+typedef void (APIENTRYP PFNGLPATHCOORDSNVPROC) (GLuint path, GLsizei numCoords, GLenum coordType, const GLvoid *coords);
 11707+typedef void (APIENTRYP PFNGLPATHSUBCOMMANDSNVPROC) (GLuint path, GLsizei commandStart, GLsizei commandsToDelete, GLsizei numCommands, const GLubyte *commands, GLsizei numCoords, GLenum coordType, const GLvoid *coords);
 11708+typedef void (APIENTRYP PFNGLPATHSUBCOORDSNVPROC) (GLuint path, GLsizei coordStart, GLsizei numCoords, GLenum coordType, const GLvoid *coords);
 11709+typedef void (APIENTRYP PFNGLPATHSTRINGNVPROC) (GLuint path, GLenum format, GLsizei length, const GLvoid *pathString);
 11710+typedef void (APIENTRYP PFNGLPATHGLYPHSNVPROC) (GLuint firstPathName, GLenum fontTarget, const GLvoid *fontName, GLbitfield fontStyle, GLsizei numGlyphs, GLenum type, const GLvoid *charcodes, GLenum handleMissingGlyphs, GLuint pathParameterTemplate, GLfloat emScale);
 11711+typedef void (APIENTRYP PFNGLPATHGLYPHRANGENVPROC) (GLuint firstPathName, GLenum fontTarget, const GLvoid *fontName, GLbitfield fontStyle, GLuint firstGlyph, GLsizei numGlyphs, GLenum handleMissingGlyphs, GLuint pathParameterTemplate, GLfloat emScale);
 11712+typedef void (APIENTRYP PFNGLWEIGHTPATHSNVPROC) (GLuint resultPath, GLsizei numPaths, const GLuint *paths, const GLfloat *weights);
 11713+typedef void (APIENTRYP PFNGLCOPYPATHNVPROC) (GLuint resultPath, GLuint srcPath);
 11714+typedef void (APIENTRYP PFNGLINTERPOLATEPATHSNVPROC) (GLuint resultPath, GLuint pathA, GLuint pathB, GLfloat weight);
 11715+typedef void (APIENTRYP PFNGLTRANSFORMPATHNVPROC) (GLuint resultPath, GLuint srcPath, GLenum transformType, const GLfloat *transformValues);
 11716+typedef void (APIENTRYP PFNGLPATHPARAMETERIVNVPROC) (GLuint path, GLenum pname, const GLint *value);
 11717+typedef void (APIENTRYP PFNGLPATHPARAMETERINVPROC) (GLuint path, GLenum pname, GLint value);
 11718+typedef void (APIENTRYP PFNGLPATHPARAMETERFVNVPROC) (GLuint path, GLenum pname, const GLfloat *value);
 11719+typedef void (APIENTRYP PFNGLPATHPARAMETERFNVPROC) (GLuint path, GLenum pname, GLfloat value);
 11720+typedef void (APIENTRYP PFNGLPATHDASHARRAYNVPROC) (GLuint path, GLsizei dashCount, const GLfloat *dashArray);
 11721+typedef void (APIENTRYP PFNGLPATHSTENCILFUNCNVPROC) (GLenum func, GLint ref, GLuint mask);
 11722+typedef void (APIENTRYP PFNGLPATHSTENCILDEPTHOFFSETNVPROC) (GLfloat factor, GLfloat units);
 11723+typedef void (APIENTRYP PFNGLSTENCILFILLPATHNVPROC) (GLuint path, GLenum fillMode, GLuint mask);
 11724+typedef void (APIENTRYP PFNGLSTENCILSTROKEPATHNVPROC) (GLuint path, GLint reference, GLuint mask);
 11725+typedef void (APIENTRYP PFNGLSTENCILFILLPATHINSTANCEDNVPROC) (GLsizei numPaths, GLenum pathNameType, const GLvoid *paths, GLuint pathBase, GLenum fillMode, GLuint mask, GLenum transformType, const GLfloat *transformValues);
 11726+typedef void (APIENTRYP PFNGLSTENCILSTROKEPATHINSTANCEDNVPROC) (GLsizei numPaths, GLenum pathNameType, const GLvoid *paths, GLuint pathBase, GLint reference, GLuint mask, GLenum transformType, const GLfloat *transformValues);
 11727+typedef void (APIENTRYP PFNGLPATHCOVERDEPTHFUNCNVPROC) (GLenum func);
 11728+typedef void (APIENTRYP PFNGLPATHCOLORGENNVPROC) (GLenum color, GLenum genMode, GLenum colorFormat, const GLfloat *coeffs);
 11729+typedef void (APIENTRYP PFNGLPATHTEXGENNVPROC) (GLenum texCoordSet, GLenum genMode, GLint components, const GLfloat *coeffs);
 11730+typedef void (APIENTRYP PFNGLPATHFOGGENNVPROC) (GLenum genMode);
 11731+typedef void (APIENTRYP PFNGLCOVERFILLPATHNVPROC) (GLuint path, GLenum coverMode);
 11732+typedef void (APIENTRYP PFNGLCOVERSTROKEPATHNVPROC) (GLuint path, GLenum coverMode);
 11733+typedef void (APIENTRYP PFNGLCOVERFILLPATHINSTANCEDNVPROC) (GLsizei numPaths, GLenum pathNameType, const GLvoid *paths, GLuint pathBase, GLenum coverMode, GLenum transformType, const GLfloat *transformValues);
 11734+typedef void (APIENTRYP PFNGLCOVERSTROKEPATHINSTANCEDNVPROC) (GLsizei numPaths, GLenum pathNameType, const GLvoid *paths, GLuint pathBase, GLenum coverMode, GLenum transformType, const GLfloat *transformValues);
 11735+typedef void (APIENTRYP PFNGLGETPATHPARAMETERIVNVPROC) (GLuint path, GLenum pname, GLint *value);
 11736+typedef void (APIENTRYP PFNGLGETPATHPARAMETERFVNVPROC) (GLuint path, GLenum pname, GLfloat *value);
 11737+typedef void (APIENTRYP PFNGLGETPATHCOMMANDSNVPROC) (GLuint path, GLubyte *commands);
 11738+typedef void (APIENTRYP PFNGLGETPATHCOORDSNVPROC) (GLuint path, GLfloat *coords);
 11739+typedef void (APIENTRYP PFNGLGETPATHDASHARRAYNVPROC) (GLuint path, GLfloat *dashArray);
 11740+typedef void (APIENTRYP PFNGLGETPATHMETRICSNVPROC) (GLbitfield metricQueryMask, GLsizei numPaths, GLenum pathNameType, const GLvoid *paths, GLuint pathBase, GLsizei stride, GLfloat *metrics);
 11741+typedef void (APIENTRYP PFNGLGETPATHMETRICRANGENVPROC) (GLbitfield metricQueryMask, GLuint firstPathName, GLsizei numPaths, GLsizei stride, GLfloat *metrics);
 11742+typedef void (APIENTRYP PFNGLGETPATHSPACINGNVPROC) (GLenum pathListMode, GLsizei numPaths, GLenum pathNameType, const GLvoid *paths, GLuint pathBase, GLfloat advanceScale, GLfloat kerningScale, GLenum transformType, GLfloat *returnedSpacing);
 11743+typedef void (APIENTRYP PFNGLGETPATHCOLORGENIVNVPROC) (GLenum color, GLenum pname, GLint *value);
 11744+typedef void (APIENTRYP PFNGLGETPATHCOLORGENFVNVPROC) (GLenum color, GLenum pname, GLfloat *value);
 11745+typedef void (APIENTRYP PFNGLGETPATHTEXGENIVNVPROC) (GLenum texCoordSet, GLenum pname, GLint *value);
 11746+typedef void (APIENTRYP PFNGLGETPATHTEXGENFVNVPROC) (GLenum texCoordSet, GLenum pname, GLfloat *value);
 11747+typedef GLboolean (APIENTRYP PFNGLISPOINTINFILLPATHNVPROC) (GLuint path, GLuint mask, GLfloat x, GLfloat y);
 11748+typedef GLboolean (APIENTRYP PFNGLISPOINTINSTROKEPATHNVPROC) (GLuint path, GLfloat x, GLfloat y);
 11749+typedef GLfloat (APIENTRYP PFNGLGETPATHLENGTHNVPROC) (GLuint path, GLsizei startSegment, GLsizei numSegments);
 11750+typedef GLboolean (APIENTRYP PFNGLPOINTALONGPATHNVPROC) (GLuint path, GLsizei startSegment, GLsizei numSegments, GLfloat distance, GLfloat *x, GLfloat *y, GLfloat *tangentX, GLfloat *tangentY);
 11751+#endif
 11752+
1148611753 #ifndef GL_AMD_pinned_memory
1148711754 #define GL_AMD_pinned_memory 1
1148811755 #endif
1148911756
 11757+#ifndef GL_AMD_stencil_operation_extended
 11758+#define GL_AMD_stencil_operation_extended 1
 11759+#ifdef GL_GLEXT_PROTOTYPES
 11760+GLAPI void APIENTRY glStencilOpValueAMD (GLenum face, GLuint value);
 11761+#endif /* GL_GLEXT_PROTOTYPES */
 11762+typedef void (APIENTRYP PFNGLSTENCILOPVALUEAMDPROC) (GLenum face, GLuint value);
 11763+#endif
1149011764
 11765+#ifndef GL_AMD_vertex_shader_viewport_index
 11766+#define GL_AMD_vertex_shader_viewport_index 1
 11767+#endif
 11768+
 11769+#ifndef GL_AMD_vertex_shader_layer
 11770+#define GL_AMD_vertex_shader_layer 1
 11771+#endif
 11772+
 11773+#ifndef GL_NV_bindless_texture
 11774+#define GL_NV_bindless_texture 1
 11775+#ifdef GL_GLEXT_PROTOTYPES
 11776+GLAPI GLuint64 APIENTRY glGetTextureHandleNV (GLuint texture);
 11777+GLAPI GLuint64 APIENTRY glGetTextureSamplerHandleNV (GLuint texture, GLuint sampler);
 11778+GLAPI void APIENTRY glMakeTextureHandleResidentNV (GLuint64 handle);
 11779+GLAPI void APIENTRY glMakeTextureHandleNonResidentNV (GLuint64 handle);
 11780+GLAPI GLuint64 APIENTRY glGetImageHandleNV (GLuint texture, GLint level, GLboolean layered, GLint layer, GLenum format);
 11781+GLAPI void APIENTRY glMakeImageHandleResidentNV (GLuint64 handle, GLenum access);
 11782+GLAPI void APIENTRY glMakeImageHandleNonResidentNV (GLuint64 handle);
 11783+GLAPI void APIENTRY glUniformHandleui64NV (GLint location, GLuint64 value);
 11784+GLAPI void APIENTRY glUniformHandleui64vNV (GLint location, GLsizei count, const GLuint64 *value);
 11785+GLAPI void APIENTRY glProgramUniformHandleui64NV (GLuint program, GLint location, GLuint64 value);
 11786+GLAPI void APIENTRY glProgramUniformHandleui64vNV (GLuint program, GLint location, GLsizei count, const GLuint64 *values);
 11787+GLAPI GLboolean APIENTRY glIsTextureHandleResidentNV (GLuint64 handle);
 11788+GLAPI GLboolean APIENTRY glIsImageHandleResidentNV (GLuint64 handle);
 11789+#endif /* GL_GLEXT_PROTOTYPES */
 11790+typedef GLuint64 (APIENTRYP PFNGLGETTEXTUREHANDLENVPROC) (GLuint texture);
 11791+typedef GLuint64 (APIENTRYP PFNGLGETTEXTURESAMPLERHANDLENVPROC) (GLuint texture, GLuint sampler);
 11792+typedef void (APIENTRYP PFNGLMAKETEXTUREHANDLERESIDENTNVPROC) (GLuint64 handle);
 11793+typedef void (APIENTRYP PFNGLMAKETEXTUREHANDLENONRESIDENTNVPROC) (GLuint64 handle);
 11794+typedef GLuint64 (APIENTRYP PFNGLGETIMAGEHANDLENVPROC) (GLuint texture, GLint level, GLboolean layered, GLint layer, GLenum format);
 11795+typedef void (APIENTRYP PFNGLMAKEIMAGEHANDLERESIDENTNVPROC) (GLuint64 handle, GLenum access);
 11796+typedef void (APIENTRYP PFNGLMAKEIMAGEHANDLENONRESIDENTNVPROC) (GLuint64 handle);
 11797+typedef void (APIENTRYP PFNGLUNIFORMHANDLEUI64NVPROC) (GLint location, GLuint64 value);
 11798+typedef void (APIENTRYP PFNGLUNIFORMHANDLEUI64VNVPROC) (GLint location, GLsizei count, const GLuint64 *value);
 11799+typedef void (APIENTRYP PFNGLPROGRAMUNIFORMHANDLEUI64NVPROC) (GLuint program, GLint location, GLuint64 value);
 11800+typedef void (APIENTRYP PFNGLPROGRAMUNIFORMHANDLEUI64VNVPROC) (GLuint program, GLint location, GLsizei count, const GLuint64 *values);
 11801+typedef GLboolean (APIENTRYP PFNGLISTEXTUREHANDLERESIDENTNVPROC) (GLuint64 handle);
 11802+typedef GLboolean (APIENTRYP PFNGLISIMAGEHANDLERESIDENTNVPROC) (GLuint64 handle);
 11803+#endif
 11804+
 11805+#ifndef GL_NV_shader_atomic_float
 11806+#define GL_NV_shader_atomic_float 1
 11807+#endif
 11808+
 11809+
1149111810 #ifdef __cplusplus
1149211811 }
1149311812 #endif
Index: ddraw/include/GL/wglext.h
——@@ -6,7 +6,7 @@
77 #endif
88
99 /*
10 -** Copyright (c) 2007-2011 The Khronos Group Inc.
 10+** Copyright (c) 2007-2012 The Khronos Group Inc.
1111 **
1212 ** Permission is hereby granted, free of charge, to any person obtaining a
1313 ** copy of this software and/or associated documentation files (the
——@@ -48,9 +48,9 @@
4949 /*************************************************************/
5050
5151 /* Header file version number */
52 -/* wglext.h last updated 2011/04/13 */
 52+/* wglext.h last updated 2012/01/04 */
5353 /* Current version at http://www.opengl.org/registry/ */
54 -#define WGL_WGLEXT_VERSION 23
 54+#define WGL_WGLEXT_VERSION 24
5555
5656 #ifndef WGL_ARB_buffer_region
5757 #define WGL_FRONT_COLOR_BUFFER_BIT_ARB 0x00000001
——@@ -422,7 +422,13 @@
423423 #define WGL_ACCESS_WRITE_DISCARD_NV 0x00000002
424424 #endif
425425
 426+#ifndef WGL_NV_DX_interop2
 427+#endif
426428
 429+#ifndef WGL_EXT_swap_control_tear
 430+#endif
 431+
 432+
427433 /*************************************************************/
428434
429435 #ifndef WGL_ARB_pbuffer
——@@ -921,7 +927,15 @@
922928 typedef BOOL (WINAPI * PFNWGLDXUNLOCKOBJECTSNVPROC) (HANDLE hDevice, GLint count, HANDLE *hObjects);
923929 #endif
924930
 931+#ifndef WGL_NV_DX_interop2
 932+#define WGL_NV_DX_interop2 1
 933+#endif
925934
 935+#ifndef WGL_EXT_swap_control_tear
 936+#define WGL_EXT_swap_control_tear 1
 937+#endif
 938+
 939+
926940 #ifdef __cplusplus
927941 }
928942 #endif
Index: ddraw/shadergen.cpp
——@@ -715,10 +715,10 @@
716716 {
717717 case D3DTA_CURRENT:
718718 default:
719 - arg2 = blendargs[0];
 719+ arg2 = blendargs[10];
720720 break;
721721 case D3DTA_DIFFUSE:
722 - arg2 = blendargs[1]+blendargs[8];
 722+ arg2 = blendargs[1]+blendargs[9];
723723 break;
724724 case D3DTA_TEXTURE:
725725 if((texstate[i].shaderid >> 59)&1)
——@@ -731,14 +731,14 @@
732732 break;
733733 case D3DTA_TFACTOR:
734734 FIXME("Support texture factor value");
735 - arg2 = blendargs[4]+blendargs[8];
 735+ arg2 = blendargs[4]+blendargs[9];
736736 break;
737737 case D3DTA_SPECULAR:
738 - arg2 = blendargs[5]+blendargs[8];
 738+ arg2 = blendargs[5]+blendargs[9];
739739 break;
740740 }
741741 if(args[3] & D3DTA_COMPLEMENT)
742 - arg1 = "(1.0 - " + arg1 + ")";
 742+ arg2 = "(1.0 - " + arg2 + ")";
743743 if(!texfail) switch(texstate[i].shaderid & 31)
744744 {
745745 case D3DTOP_DISABLE:
Retrieved from "https://dxgl.org/wiki/Special:Code/DXGL/168"