Module: wine Branch: master Commit: 3c49a012c032759f015fca0594e8818040e26cf3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3c49a012c032759f015fca0594...
Author: Matteo Bruni mbruni@codeweavers.com Date: Fri Jul 10 00:06:18 2015 +0200
wined3d: Add more entries to the core extensions table.
---
dlls/wined3d/directx.c | 63 ++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 63 insertions(+)
diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index f045bb5..859da9d 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -3350,10 +3350,73 @@ static BOOL wined3d_adapter_init_gl_caps(struct wined3d_adapter *adapter) core_extensions[] = { {EXT_TEXTURE3D, MAKEDWORD_VERSION(1, 2)}, + {ARB_MULTISAMPLE, MAKEDWORD_VERSION(1, 3)}, + {ARB_MULTITEXTURE, MAKEDWORD_VERSION(1, 3)}, + {ARB_TEXTURE_BORDER_CLAMP, MAKEDWORD_VERSION(1, 3)}, + {ARB_TEXTURE_COMPRESSION, MAKEDWORD_VERSION(1, 3)}, + {ARB_TEXTURE_CUBE_MAP, MAKEDWORD_VERSION(1, 3)}, + {ARB_DEPTH_TEXTURE, MAKEDWORD_VERSION(1, 4)}, + {ARB_POINT_PARAMETERS, MAKEDWORD_VERSION(1, 4)}, + {ARB_SHADOW, MAKEDWORD_VERSION(1, 4)}, + {ARB_TEXTURE_MIRRORED_REPEAT, MAKEDWORD_VERSION(1, 4)}, + {EXT_BLEND_COLOR, MAKEDWORD_VERSION(1, 4)}, + {EXT_BLEND_FUNC_SEPARATE, MAKEDWORD_VERSION(1, 4)}, {EXT_BLEND_MINMAX, MAKEDWORD_VERSION(1, 4)}, {EXT_BLEND_SUBTRACT, MAKEDWORD_VERSION(1, 4)}, + {EXT_STENCIL_WRAP, MAKEDWORD_VERSION(1, 4)}, {NV_POINT_SPRITE, MAKEDWORD_VERSION(1, 4)}, + {ARB_OCCLUSION_QUERY, MAKEDWORD_VERSION(1, 5)}, + {ARB_VERTEX_BUFFER_OBJECT, MAKEDWORD_VERSION(1, 5)}, + {ARB_DRAW_BUFFERS, MAKEDWORD_VERSION(2, 0)}, + {ARB_FRAGMENT_SHADER, MAKEDWORD_VERSION(2, 0)}, + {ARB_SHADING_LANGUAGE_100, MAKEDWORD_VERSION(2, 0)}, {ARB_TEXTURE_NON_POWER_OF_TWO, MAKEDWORD_VERSION(2, 0)}, + {ARB_VERTEX_SHADER, MAKEDWORD_VERSION(2, 0)}, + {EXT_BLEND_EQUATION_SEPARATE, MAKEDWORD_VERSION(2, 0)}, + {ARB_PIXEL_BUFFER_OBJECT, MAKEDWORD_VERSION(2, 1)}, + {EXT_TEXTURE_SRGB, MAKEDWORD_VERSION(2, 1)}, + {ARB_COLOR_BUFFER_FLOAT, MAKEDWORD_VERSION(3, 0)}, + {ARB_DEPTH_BUFFER_FLOAT, MAKEDWORD_VERSION(3, 0)}, + {ARB_FRAMEBUFFER_OBJECT, MAKEDWORD_VERSION(3, 0)}, + {ARB_FRAMEBUFFER_SRGB, MAKEDWORD_VERSION(3, 0)}, + {ARB_HALF_FLOAT_PIXEL, MAKEDWORD_VERSION(3, 0)}, + {ARB_HALF_FLOAT_VERTEX, MAKEDWORD_VERSION(3, 0)}, + {ARB_MAP_BUFFER_RANGE, MAKEDWORD_VERSION(3, 0)}, + {ARB_TEXTURE_COMPRESSION_RGTC, MAKEDWORD_VERSION(3, 0)}, + {ARB_TEXTURE_FLOAT, MAKEDWORD_VERSION(3, 0)}, + {ARB_TEXTURE_RG, MAKEDWORD_VERSION(3, 0)}, + {EXT_DRAW_BUFFERS2, MAKEDWORD_VERSION(3, 0)}, + /* We don't want to enable EXT_GPU_SHADER4: even though similar + * functionality is available in core GL 3.0 / GLSL 1.30, it's different + * enough that reusing the same flag for the new features hurts more + * than it helps. */ + /* EXT_framebuffer_object, EXT_framebuffer_blit, + * EXT_framebuffer_multisample and EXT_packed_depth_stencil + * are integrated into ARB_framebuffer_object. */ + + {ARB_DRAW_INSTANCED, MAKEDWORD_VERSION(3, 1)}, + {ARB_UNIFORM_BUFFER_OBJECT, MAKEDWORD_VERSION(3, 1)}, + {EXT_TEXTURE_SNORM, MAKEDWORD_VERSION(3, 1)}, + /* We don't need or want GL_ARB_texture_rectangle (core in 3.1). */ + + {ARB_DRAW_ELEMENTS_BASE_VERTEX, MAKEDWORD_VERSION(3, 2)}, + /* ARB_geometry_shader4 exposes a somewhat different API compared to 3.2 + * core geometry shaders so it's not really correct to expose the + * extension for core-only support. */ + {ARB_PROVOKING_VERTEX, MAKEDWORD_VERSION(3, 2)}, + {ARB_SYNC, MAKEDWORD_VERSION(3, 2)}, + {ARB_VERTEX_ARRAY_BGRA, MAKEDWORD_VERSION(3, 2)}, + + {ARB_BLEND_FUNC_EXTENDED, MAKEDWORD_VERSION(3, 3)}, + {ARB_INSTANCED_ARRAYS, MAKEDWORD_VERSION(3, 3)}, + {ARB_SAMPLER_OBJECTS, MAKEDWORD_VERSION(3, 3)}, + {ARB_SHADER_BIT_ENCODING, MAKEDWORD_VERSION(3, 3)}, + {ARB_TIMER_QUERY, MAKEDWORD_VERSION(3, 3)}, + + {ARB_MAP_BUFFER_ALIGNMENT, MAKEDWORD_VERSION(4, 2)}, + + {ARB_DEBUG_OUTPUT, MAKEDWORD_VERSION(4, 3)}, + {ARB_INTERNALFORMAT_QUERY2, MAKEDWORD_VERSION(4, 3)}, }; struct wined3d_driver_info *driver_info = &adapter->driver_info; const char *gl_vendor_str, *gl_renderer_str, *gl_version_str;