Henri Verbeet : wined3d: Remove unused occlusion query extensions.

[Alexandre Julliard]

Module: wine
Branch: master
Commit: 60ad1aed63018120bf849bbf572851e2ef2d1e3a
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=60ad1aed63018120bf849bbf57...

Author: Henri Verbeet <hverbeet(a)codeweavers.com>
Date:   Thu Jan 21 10:38:31 2010 +0100

wined3d: Remove unused occlusion query extensions.

---

 dlls/wined3d/directx.c    |    1 -
 dlls/wined3d/query.c      |    2 +-
 dlls/wined3d/wined3d_gl.h |   24 ------------------------
 3 files changed, 1 insertions(+), 26 deletions(-)

diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c
index 366651f..b8684c2 100644
--- a/dlls/wined3d/directx.c
+++ b/dlls/wined3d/directx.c
@@ -133,7 +133,6 @@ static const struct {
     {"GL_NV_fragment_program_option",       NV_FRAGMENT_PROGRAM_OPTION,     0                           },
     {"GL_NV_half_float",                    NV_HALF_FLOAT,                  0                           },
     {"GL_NV_light_max_exponent",            NV_LIGHT_MAX_EXPONENT,          0                           },
-    {"GL_NV_occlusion_query",               NV_OCCLUSION_QUERY,             0                           },
     {"GL_NV_register_combiners",            NV_REGISTER_COMBINERS,          0                           },
     {"GL_NV_register_combiners2",           NV_REGISTER_COMBINERS2,         0                           },
     {"GL_NV_texgen_reflection",             NV_TEXGEN_REFLECTION,           0                           },
diff --git a/dlls/wined3d/query.c b/dlls/wined3d/query.c
index 92e09e4..cc7d7aa 100644
--- a/dlls/wined3d/query.c
+++ b/dlls/wined3d/query.c
@@ -435,7 +435,7 @@ HRESULT query_init(IWineD3DQueryImpl *query, IWineD3DDeviceImpl *device,
             TRACE("Occlusion query.\n");
             if (!gl_info->supported[ARB_OCCLUSION_QUERY])
             {
-                WARN("Unsupported in local OpenGL implementation: ARB_OCCLUSION_QUERY/NV_OCCLUSION_QUERY\n");
+                WARN("Unsupported in local OpenGL implementation: ARB_OCCLUSION_QUERY.\n");
                 return WINED3DERR_NOTAVAILABLE;
             }
             query->lpVtbl = &IWineD3DOcclusionQuery_Vtbl;
diff --git a/dlls/wined3d/wined3d_gl.h b/dlls/wined3d/wined3d_gl.h
index a70caf8..c5ecb3a 100644
--- a/dlls/wined3d/wined3d_gl.h
+++ b/dlls/wined3d/wined3d_gl.h
@@ -1810,7 +1810,6 @@ typedef enum wined3d_gl_extension
     NV_FRAGMENT_PROGRAM_OPTION,
     NV_HALF_FLOAT,
     NV_LIGHT_MAX_EXPONENT,
-    NV_OCCLUSION_QUERY,
     NV_REGISTER_COMBINERS,
     NV_REGISTER_COMBINERS2,
     NV_TEXGEN_REFLECTION,
@@ -3318,13 +3317,6 @@ typedef void (WINE_GLAPI *PGLFNGETCOMPRESSEDTEXIMAGEPROC)(GLenum target, GLint l
 #define GL_TEXTURE_SWIZZLE_RGBA_EXT                         0x8e46
 #endif
 
-/* GL_HP_occlusion_test */
-#ifndef GL_HP_occlusion_test
-#define GL_HP_occlusion_test 1
-#define GL_OCCLUSION_TEST_HP                                0x8165
-#define GL_OCCLUSION_TEST_RESULT_HP                         0x8165
-#endif
-
 /* GL_NV_depth_clamp */
 #ifndef GL_NV_depth_clamp
 #define GL_NV_depth_clamp 1
@@ -3415,22 +3407,6 @@ typedef void (WINE_GLAPI *PGLFNVERTEXATTRIBS4HVNVPROC)(GLuint index, GLsizei n,
 #define GL_MAX_SPOT_EXPONENT_NV                             0x8505
 #endif
 
-/* GL_NV_occlusion_query */
-#ifndef GL_NV_occlusion_query
-#define GL_NV_occlusion_query 1
-#define GL_PIXEL_COUNTER_BITS_NV                            0x8864
-#define GL_CURRENT_OCCLUSION_QUERY_ID_NV                    0x8865
-#define GL_PIXEL_COUNT_NV                                   0x8866
-#define GL_PIXEL_COUNT_AVAILABLE_NV                         0x8867
-#endif
-typedef void (WINE_GLAPI *PGLFNGENOCCLUSIONQUERIESNVPROC)(GLsizei n, GLuint *ids);
-typedef void (WINE_GLAPI *PGLFNDELETEOCCLUSIONQUERIESNVPROC)(GLsizei n, const GLuint *ids);
-typedef GLboolean (WINE_GLAPI *PGLFNISOCCLUSIONQUERYNVPROC)(GLuint id);
-typedef void (WINE_GLAPI *PGLFNBEGINOCCLUSIONQUERYNVPROC)(GLuint id);
-typedef void (WINE_GLAPI *PGLFNENDOCCLUSIONQUERYNVPROC)(void);
-typedef void (WINE_GLAPI *PGLFNGETOCCLUSIONQUERYIVNVPROC)(GLuint id, GLenum pname, GLint *params);
-typedef void (WINE_GLAPI *PGLFNGETOCCLUSIONQUERYUIVNVPROC)(GLuint id, GLenum pname, GLuint *params);
-
 /* GL_NV_register_combiners */
 #ifndef GL_NV_register_combiners
 #define GL_NV_register_combiners 1