On Fri, Nov 18, 2016 at 4:44 AM, Andrew Wesie awesie@gmail.com wrote:
@@ -8602,6 +8602,16 @@ static void shader_glsl_init_context_state(struct wined3d_context *context)
gl_info->gl_ops.gl.p_glEnable(GL_PROGRAM_POINT_SIZE); checkGLcall("GL_PROGRAM_POINT_SIZE");
- if (gl_info->supported[ARB_ES3_COMPATIBILITY])
- {
/* We prefer this method because it correctly handles 16-bit and 32-bit indices. */gl_info->gl_ops.gl.p_glEnable(GL_PRIMITIVE_RESTART_FIXED_INDEX);checkGLcall("GL_PRIMITIVE_RESTART_FIXED_INDEX");- }
Is it really safe to enable the primitive restart for all D3D versions? Shouldn't we enable it just for D3D10+? See, e.g., e47a735f762ebe1545bb366c7e9e2b90db7c7f80, if it's decided that this should be enabled just for D3D10+.
- else
- {
WARN("Missing support for primitive restart index.\n");- }
This is not important, but ideally this would be a FIXME() for D3D10+ feature level >= 10_0 and nothing otherwise.
}
static void shader_glsl_get_caps(const struct wined3d_gl_info *gl_info, struct shader_caps *caps) diff --git a/dlls/wined3d/wined3d_gl.h b/dlls/wined3d/wined3d_gl.h index b71190d..7bd2d6a 100644 --- a/dlls/wined3d/wined3d_gl.h +++ b/dlls/wined3d/wined3d_gl.h @@ -55,6 +55,7 @@ enum wined3d_gl_extension ARB_DRAW_ELEMENTS_BASE_VERTEX, ARB_DRAW_INSTANCED, ARB_ES2_COMPATIBILITY,
- ARB_ES3_COMPATIBILITY, ARB_EXPLICIT_ATTRIB_LOCATION, ARB_FRAGMENT_COORD_CONVENTIONS, ARB_FRAGMENT_PROGRAM,
The extension has to be also added to the "core_extensions" table.