| Index: ddraw/glExtensions.cpp |
| — | — | @@ -95,13 +95,6 @@ |
| 96 | 96 | void (APIENTRY *glMatrixLoadfEXT)(GLenum mode, const GLfloat *m) = NULL;
|
| 97 | 97 | void (APIENTRY *glMatrixMultfEXT)(GLenum mode, const GLfloat *m) = NULL;
|
| 98 | 98 |
|
| 99 | | -void (APIENTRY *glBindSampler)(GLuint unit, GLuint sampler) = NULL;
|
| 100 | | -void (APIENTRY *glDeleteSamplers)(GLsizei n, const GLuint *samplers) = NULL;
|
| 101 | | -void (APIENTRY *glGenSamplers)(GLsizei n, GLuint *samplers) = NULL;
|
| 102 | | -void (APIENTRY *glSamplerParameterf)(GLuint sampler, GLenum pname, GLfloat param) = NULL;
|
| 103 | | -void (APIENTRY *glSamplerParameteri)(GLuint sampler, GLenum pname, GLint param) = NULL;
|
| 104 | | -void (APIENTRY *glSamplerParameterfv)(GLuint sampler, GLenum pname, const GLfloat *params) = NULL;
|
| 105 | | -void (APIENTRY *glSamplerParameteriv)(GLuint sampler, GLenum pname, const GLint *params) = NULL;
|
| 106 | 99 |
|
| 107 | 100 | int GLEXT_ARB_framebuffer_object = 0;
|
| 108 | 101 | int GLEXT_EXT_framebuffer_object = 0;
|
| — | — | @@ -113,7 +106,6 @@ |
| 114 | 107 | int GLEXT_ATI_meminfo = 0;
|
| 115 | 108 | int GLEXT_ARB_ES2_compatibility = 0;
|
| 116 | 109 | int GLEXT_EXT_direct_state_access = 0;
|
| 117 | | -int GLEXT_ARB_sampler_objects = 0;
|
| 118 | 110 | int glver_major, glver_minor = 0;
|
| 119 | 111 | bool atimem = false;
|
| 120 | 112 |
|
| — | — | @@ -181,7 +173,7 @@ |
| 182 | 174 | ExitProcess(-1);
|
| 183 | 175 | }
|
| 184 | 176 | const GLubyte *glextensions = glGetString(GL_EXTENSIONS);
|
| 185 | | - if(strstr((char*)glextensions,"GL_ARB_framebuffer_object") || (glver_major >= 3)) GLEXT_ARB_framebuffer_object = 1;
|
| | 177 | + if(strstr((char*)glextensions,"GL_ARB_framebuffer_object")) GLEXT_ARB_framebuffer_object = 1;
|
| 186 | 178 | else GLEXT_ARB_framebuffer_object = 0;
|
| 187 | 179 | if(strstr((char*)glextensions,"GL_EXT_framebuffer_object")) GLEXT_EXT_framebuffer_object = 1;
|
| 188 | 180 | else GLEXT_EXT_framebuffer_object = 0;
|
| — | — | @@ -189,23 +181,18 @@ |
| 190 | 182 | else GLEXT_NV_packed_depth_stencil = 0;
|
| 191 | 183 | if(strstr((char*)glextensions,"GL_EXT_packed_depth_stencil")) GLEXT_EXT_packed_depth_stencil = 1;
|
| 192 | 184 | else GLEXT_EXT_packed_depth_stencil = 0;
|
| 193 | | - if(strstr((char*)glextensions,"GL_ARB_depth_buffer_float") || (glver_major >= 3)) GLEXT_ARB_depth_buffer_float = 1;
|
| | 185 | + if(strstr((char*)glextensions,"GL_ARB_depth_buffer_float")) GLEXT_ARB_depth_buffer_float = 1;
|
| 194 | 186 | else GLEXT_ARB_depth_buffer_float = 0;
|
| 195 | | - if(strstr((char*)glextensions,"GL_ARB_depth_texture") || (glver_major >= 2)
|
| 196 | | - || ((glver_major >= 1) && (glver_minor >= 4))) GLEXT_ARB_depth_texture = 1;
|
| | 187 | + if(strstr((char*)glextensions,"GL_ARB_depth_texture")) GLEXT_ARB_depth_texture = 1;
|
| 197 | 188 | else GLEXT_ARB_depth_texture = 0;
|
| 198 | 189 | if(strstr((char*)glextensions,"GL_NVX_gpu_memory_info")) GLEXT_NVX_gpu_memory_info = 1;
|
| 199 | 190 | else GLEXT_NVX_gpu_memory_info = 0;
|
| 200 | 191 | if(strstr((char*)glextensions,"GL_ATI_meminfo")) GLEXT_ATI_meminfo = 1;
|
| 201 | 192 | else GLEXT_ATI_meminfo = 0;
|
| 202 | | - if(strstr((char*)glextensions,"GL_ARB_ES2_compatibility") || (glver_major >= 5)
|
| 203 | | - || ((glver_major >= 4) && (glver_minor >= 1))) GLEXT_ARB_ES2_compatibility = 1;
|
| | 193 | + if(strstr((char*)glextensions,"GL_ARB_ES2_compatibility")) GLEXT_ARB_ES2_compatibility = 1;
|
| 204 | 194 | else GLEXT_ARB_ES2_compatibility = 0;
|
| 205 | 195 | if(strstr((char*)glextensions,"GL_EXT_direct_state_access")) GLEXT_EXT_direct_state_access = 1;
|
| 206 | 196 | else GLEXT_EXT_direct_state_access = 0;
|
| 207 | | - if(strstr((char*)glextensions,"GL_ARB_sampler_objects") || (glver_major >= 4)
|
| 208 | | - || ((glver_major >= 3) && (glver_minor >= 3))) GLEXT_ARB_sampler_objects = 1;
|
| 209 | | - else GLEXT_ARB_sampler_objects = 0;
|
| 210 | 197 | bool broken_fbo = true;
|
| 211 | 198 | if(GLEXT_ARB_framebuffer_object)
|
| 212 | 199 | {
|
| — | — | @@ -242,10 +229,6 @@ |
| 243 | 230 | glMatrixLoadfEXT = (PFNGLMATRIXLOADFEXTPROC)wglGetProcAddress("glMatrixLoadfEXT");
|
| 244 | 231 | glMatrixMultfEXT = (PFNGLMATRIXMULTFEXTPROC)wglGetProcAddress("glMatrixMultfEXT");
|
| 245 | 232 | }
|
| 246 | | - if(GLEXT_ARB_sampler_objects)
|
| 247 | | - {
|
| 248 | | -
|
| 249 | | - }
|
| 250 | 233 | if(broken_fbo)
|
| 251 | 234 | {
|
| 252 | 235 | MessageBox(NULL,_T("DXGL requires support for OpenGL Framebuffer Objects to function. \
|
| Index: ddraw/glExtensions.h |
| — | — | @@ -36,7 +36,6 @@ |
| 37 | 37 | extern int GLEXT_ATI_meminfo;
|
| 38 | 38 | extern int GLEXT_ARB_ES2_compatibility;
|
| 39 | 39 | extern int GLEXT_EXT_direct_state_access;
|
| 40 | | -extern int GLEXT_ARB_sampler_objects;
|
| 41 | 40 | extern int glver_major;
|
| 42 | 41 | extern int glver_minor;
|
| 43 | 42 | #define GL_GPU_MEMORY_INFO_DEDICATED_VIDMEM_NVX 0x9047
|
| — | — | @@ -125,14 +124,6 @@ |
| 126 | 125 | GLAPI void (APIENTRY *glMatrixLoadfEXT)(GLenum mode, const GLfloat *m);
|
| 127 | 126 | GLAPI void (APIENTRY *glMatrixMultfEXT)(GLenum mode, const GLfloat *m);
|
| 128 | 127 |
|
| 129 | | -GLAPI void (APIENTRY *glBindSampler)(GLuint unit, GLuint sampler);
|
| 130 | | -GLAPI void (APIENTRY *glDeleteSamplers)(GLsizei n, const GLuint *samplers);
|
| 131 | | -GLAPI void (APIENTRY *glGenSamplers)(GLsizei n, GLuint *samplers);
|
| 132 | | -GLAPI void (APIENTRY *glSamplerParameterf)(GLuint sampler, GLenum pname, GLfloat param);
|
| 133 | | -GLAPI void (APIENTRY *glSamplerParameteri)(GLuint sampler, GLenum pname, GLint param);
|
| 134 | | -GLAPI void (APIENTRY *glSamplerParameterfv)(GLuint sampler, GLenum pname, const GLfloat *params);
|
| 135 | | -GLAPI void (APIENTRY *glSamplerParameteriv)(GLuint sampler, GLenum pname, const GLint *params);
|
| 136 | | -
|
| 137 | 128 | void InitGLExt();
|
| 138 | 129 |
|
| 139 | 130 | #endif //_GLEXTENSIONS_H
|