Matteo Bruni : wined3d: Add ARB_internalformat_query extension.

Alexandre Julliard julliard at wine.codeweavers.com
Wed Jan 27 11:27:20 CST 2016


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

Author: Matteo Bruni <mbruni at codeweavers.com>
Date:   Tue Jan 26 22:51:30 2016 +0100

wined3d: Add ARB_internalformat_query extension.

Signed-off-by: Matteo Bruni <mbruni at codeweavers.com>
Signed-off-by: Henri Verbeet <hverbeet at codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard at winehq.org>

---

 dlls/wined3d/directx.c    | 6 ++++--
 dlls/wined3d/wined3d_gl.h | 1 +
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c
index 2fe9597..9faf4ec 100644
--- a/dlls/wined3d/directx.c
+++ b/dlls/wined3d/directx.c
@@ -123,8 +123,9 @@ static const struct wined3d_extension_map gl_extension_map[] =
     {"GL_ARB_geometry_shader4",             ARB_GEOMETRY_SHADER4          },
     {"GL_ARB_half_float_pixel",             ARB_HALF_FLOAT_PIXEL          },
     {"GL_ARB_half_float_vertex",            ARB_HALF_FLOAT_VERTEX         },
-    {"GL_ARB_instanced_arrays",             ARB_INSTANCED_ARRAYS,         },
-    {"GL_ARB_internalformat_query2",        ARB_INTERNALFORMAT_QUERY2,    },
+    {"GL_ARB_instanced_arrays",             ARB_INSTANCED_ARRAYS          },
+    {"GL_ARB_internalformat_query",         ARB_INTERNALFORMAT_QUERY      },
+    {"GL_ARB_internalformat_query2",        ARB_INTERNALFORMAT_QUERY2     },
     {"GL_ARB_map_buffer_alignment",         ARB_MAP_BUFFER_ALIGNMENT      },
     {"GL_ARB_map_buffer_range",             ARB_MAP_BUFFER_RANGE          },
     {"GL_ARB_multisample",                  ARB_MULTISAMPLE               },
@@ -3441,6 +3442,7 @@ static BOOL wined3d_adapter_init_gl_caps(struct wined3d_adapter *adapter)
 
         {ARB_ES2_COMPATIBILITY,            MAKEDWORD_VERSION(4, 1)},
 
+        {ARB_INTERNALFORMAT_QUERY,         MAKEDWORD_VERSION(4, 2)},
         {ARB_MAP_BUFFER_ALIGNMENT,         MAKEDWORD_VERSION(4, 2)},
 
         {ARB_DEBUG_OUTPUT,                 MAKEDWORD_VERSION(4, 3)},
diff --git a/dlls/wined3d/wined3d_gl.h b/dlls/wined3d/wined3d_gl.h
index a8c0db1..be4e308 100644
--- a/dlls/wined3d/wined3d_gl.h
+++ b/dlls/wined3d/wined3d_gl.h
@@ -60,6 +60,7 @@ enum wined3d_gl_extension
     ARB_HALF_FLOAT_PIXEL,
     ARB_HALF_FLOAT_VERTEX,
     ARB_INSTANCED_ARRAYS,
+    ARB_INTERNALFORMAT_QUERY,
     ARB_INTERNALFORMAT_QUERY2,
     ARB_MAP_BUFFER_ALIGNMENT,
     ARB_MAP_BUFFER_RANGE,




More information about the wine-cvs mailing list