[PATCH 3/3] wined3d: Cleanup extension check for shader model 4 support.
Matteo Bruni
mbruni at codeweavers.com
Wed Oct 28 16:27:27 CDT 2015
This essentially enables shader model 4 support with Mesa or OS X when
using core profile.
Signed-off-by: Matteo Bruni <mbruni at codeweavers.com>
---
Of course the core profile code isn't quite complete yet but I think
this patch doesn't have to wait for it.
dlls/wined3d/glsl_shader.c | 6 ++----
1 file changed, 2 insertions(+), 4 deletions(-)
diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c
index 4a95e44..69ee4b9 100644
--- a/dlls/wined3d/glsl_shader.c
+++ b/dlls/wined3d/glsl_shader.c
@@ -7761,10 +7761,8 @@ static void shader_glsl_get_caps(const struct wined3d_gl_info *gl_info, struct s
{
UINT shader_model;
- if (gl_info->supported[EXT_GPU_SHADER4] && gl_info->supported[ARB_SHADER_BIT_ENCODING]
- && gl_info->supported[ARB_GEOMETRY_SHADER4] && gl_info->glsl_version >= MAKEDWORD_VERSION(1, 50)
- && gl_info->supported[ARB_DRAW_ELEMENTS_BASE_VERTEX] && gl_info->supported[ARB_DRAW_INSTANCED]
- && gl_info->supported[ARB_TEXTURE_RG] && gl_info->supported[ARB_SAMPLER_OBJECTS])
+ if (gl_info->glsl_version >= MAKEDWORD_VERSION(1, 50) && gl_info->supported[ARB_SHADER_BIT_ENCODING]
+ && gl_info->supported[ARB_SAMPLER_OBJECTS])
shader_model = 4;
/* ARB_shader_texture_lod or EXT_gpu_shader4 is required for the SM3
* texldd and texldl instructions. */
--
2.4.10
More information about the wine-patches
mailing list