diff options
| author | Matt Turner <[email protected]> | 2013-08-28 18:01:39 -0700 |
|---|---|---|
| committer | Matt Turner <[email protected]> | 2013-09-09 15:01:08 -0700 |
| commit | 56fff7063dd05232cf86aef9d2ae1c04c52a8360 (patch) | |
| tree | 2be41e9db05029a329484e18cfb35cdcc2ded843 /src/mesa/main | |
| parent | fd183fa02c4430e439faf6a5195f5008d34db987 (diff) | |
glsl: Implement MESA_shader_integer_mix extension.
Because why doesn't GLSL allow you to do this already?
Reviewed-by: Kenneth Graunke <[email protected]>
Reviewed-by: Ian Romanick <[email protected]>
Diffstat (limited to 'src/mesa/main')
| -rw-r--r-- | src/mesa/main/extensions.c | 1 | ||||
| -rw-r--r-- | src/mesa/main/mtypes.h | 3 |
2 files changed, 3 insertions, 1 deletions
diff --git a/src/mesa/main/extensions.c b/src/mesa/main/extensions.c index f60157f8cce..88fcde3b90b 100644 --- a/src/mesa/main/extensions.c +++ b/src/mesa/main/extensions.c @@ -311,6 +311,7 @@ static const struct extension extension_table[] = { { "GL_IBM_texture_mirrored_repeat", o(dummy_true), GLL, 1998 }, { "GL_INGR_blend_func_separate", o(EXT_blend_func_separate), GLL, 1999 }, { "GL_MESA_pack_invert", o(MESA_pack_invert), GL, 2002 }, + { "GL_MESA_shader_integer_mix", o(MESA_shader_integer_mix), GL | ES3, 2013 }, { "GL_MESA_texture_array", o(MESA_texture_array), GLL, 2007 }, { "GL_MESA_texture_signed_rgba", o(EXT_texture_snorm), GL, 2009 }, { "GL_MESA_window_pos", o(dummy_true), GLL, 2000 }, diff --git a/src/mesa/main/mtypes.h b/src/mesa/main/mtypes.h index ef16c5910a6..ca7111e509b 100644 --- a/src/mesa/main/mtypes.h +++ b/src/mesa/main/mtypes.h @@ -3154,8 +3154,9 @@ struct gl_extensions GLboolean ATI_fragment_shader; GLboolean ATI_separate_stencil; GLboolean MESA_pack_invert; - GLboolean MESA_ycbcr_texture; + GLboolean MESA_shader_integer_mix; GLboolean MESA_texture_array; + GLboolean MESA_ycbcr_texture; GLboolean NV_conditional_render; GLboolean NV_fog_distance; GLboolean NV_fragment_program_option; |