glsl: enforce restrictions on builtin functions moved to compat
Section 8.9.4 (Compatibility Profile Texture Functions) of the GLSL 4.20 spec outlines a number of builtin texture functions that have been moved to compatibility shaders. This change enforces those restrictions. Note we don't worry about enforcing restrictions on the EXT_gpu_shader4 extensions of these functions because EXT_gpu_shader4 should only be enabled for compat already. Reviewed-by: Marek Olšák <marek.olsak@amd.com> Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/9887>
This commit is contained in:
Timothy Arceri
Marge Bot
parent
6dc07a173e
commit
3d1022382c
|
|
@ -122,6 +122,19 @@ gs_only(const _mesa_glsl_parse_state *state)
|
|||
return state->stage == MESA_SHADER_GEOMETRY;
|
||||
}
|
||||
|
||||
/* For texture functions moved to compat profile in GLSL 4.20 */
|
||||
static bool
|
||||
deprecated_texture(const _mesa_glsl_parse_state *state)
|
||||
{
|
||||
return state->compat_shader || !state->is_version(420, 0);
|
||||
}
|
||||
|
||||
static bool
|
||||
deprecated_texture_derivatives_only(const _mesa_glsl_parse_state *state)
|
||||
{
|
||||
return deprecated_texture(state) && derivatives_only(state);
|
||||
}
|
||||
|
||||
static bool
|
||||
v110(const _mesa_glsl_parse_state *state)
|
||||
{
|
||||
|
|
@ -129,9 +142,15 @@ v110(const _mesa_glsl_parse_state *state)
|
|||
}
|
||||
|
||||
static bool
|
||||
v110_derivatives_only(const _mesa_glsl_parse_state *state)
|
||||
v110_deprecated_texture(const _mesa_glsl_parse_state *state)
|
||||
{
|
||||
return !state->es_shader &&
|
||||
return !state->es_shader && deprecated_texture(state);
|
||||
}
|
||||
|
||||
static bool
|
||||
v110_derivatives_only_deprecated_texture(const _mesa_glsl_parse_state *state)
|
||||
{
|
||||
return v110_deprecated_texture(state) &&
|
||||
derivatives_only(state);
|
||||
}
|
||||
|
||||
|
|
@ -218,9 +237,15 @@ lod_exists_in_stage(const _mesa_glsl_parse_state *state)
|
|||
}
|
||||
|
||||
static bool
|
||||
v110_lod(const _mesa_glsl_parse_state *state)
|
||||
lod_deprecated_texture(const _mesa_glsl_parse_state *state)
|
||||
{
|
||||
return !state->es_shader && lod_exists_in_stage(state);
|
||||
return deprecated_texture(state) && lod_exists_in_stage(state);
|
||||
}
|
||||
|
||||
static bool
|
||||
v110_lod_deprecated_texture(const _mesa_glsl_parse_state *state)
|
||||
{
|
||||
return !state->es_shader && lod_deprecated_texture(state);
|
||||
}
|
||||
|
||||
static bool
|
||||
|
|
@ -577,12 +602,6 @@ derivative_control(const _mesa_glsl_parse_state *state)
|
|||
state->ARB_derivative_control_enable);
|
||||
}
|
||||
|
||||
static bool
|
||||
tex1d_lod(const _mesa_glsl_parse_state *state)
|
||||
{
|
||||
return !state->es_shader && lod_exists_in_stage(state);
|
||||
}
|
||||
|
||||
/** True if sampler3D exists */
|
||||
static bool
|
||||
tex3d(const _mesa_glsl_parse_state *state)
|
||||
|
|
@ -590,16 +609,16 @@ tex3d(const _mesa_glsl_parse_state *state)
|
|||
/* sampler3D exists in all desktop GLSL versions, GLSL ES 1.00 with the
|
||||
* OES_texture_3D extension, and in GLSL ES 3.00.
|
||||
*/
|
||||
return !state->es_shader ||
|
||||
state->OES_texture_3D_enable ||
|
||||
state->language_version >= 300;
|
||||
return (!state->es_shader ||
|
||||
state->OES_texture_3D_enable ||
|
||||
state->language_version >= 300) && deprecated_texture(state);
|
||||
}
|
||||
|
||||
static bool
|
||||
derivatives_tex3d(const _mesa_glsl_parse_state *state)
|
||||
{
|
||||
return (!state->es_shader || state->OES_texture_3D_enable) &&
|
||||
derivatives_only(state);
|
||||
derivatives_only(state) && deprecated_texture(state);
|
||||
}
|
||||
|
||||
static bool
|
||||
|
|
@ -3383,8 +3402,8 @@ builtin_builder::create_builtins()
|
|||
NULL);
|
||||
|
||||
add_function("texture1D",
|
||||
_texture(ir_tex, v110, glsl_type::vec4_type, glsl_type::sampler1D_type, glsl_type::float_type),
|
||||
_texture(ir_txb, v110_derivatives_only, glsl_type::vec4_type, glsl_type::sampler1D_type, glsl_type::float_type),
|
||||
_texture(ir_tex, v110_deprecated_texture, glsl_type::vec4_type, glsl_type::sampler1D_type, glsl_type::float_type),
|
||||
_texture(ir_txb, v110_derivatives_only_deprecated_texture, glsl_type::vec4_type, glsl_type::sampler1D_type, glsl_type::float_type),
|
||||
_texture(ir_tex, gpu_shader4_integer, glsl_type::ivec4_type, glsl_type::isampler1D_type, glsl_type::float_type),
|
||||
_texture(ir_txb, gpu_shader4_integer_derivs_only, glsl_type::ivec4_type, glsl_type::isampler1D_type, glsl_type::float_type),
|
||||
_texture(ir_tex, gpu_shader4_integer, glsl_type::uvec4_type, glsl_type::usampler1D_type, glsl_type::float_type),
|
||||
|
|
@ -3401,10 +3420,10 @@ builtin_builder::create_builtins()
|
|||
NULL);
|
||||
|
||||
add_function("texture1DProj",
|
||||
_texture(ir_tex, v110, glsl_type::vec4_type, glsl_type::sampler1D_type, glsl_type::vec2_type, TEX_PROJECT),
|
||||
_texture(ir_tex, v110, glsl_type::vec4_type, glsl_type::sampler1D_type, glsl_type::vec4_type, TEX_PROJECT),
|
||||
_texture(ir_txb, v110_derivatives_only, glsl_type::vec4_type, glsl_type::sampler1D_type, glsl_type::vec2_type, TEX_PROJECT),
|
||||
_texture(ir_txb, v110_derivatives_only, glsl_type::vec4_type, glsl_type::sampler1D_type, glsl_type::vec4_type, TEX_PROJECT),
|
||||
_texture(ir_tex, v110_deprecated_texture, glsl_type::vec4_type, glsl_type::sampler1D_type, glsl_type::vec2_type, TEX_PROJECT),
|
||||
_texture(ir_tex, v110_deprecated_texture, glsl_type::vec4_type, glsl_type::sampler1D_type, glsl_type::vec4_type, TEX_PROJECT),
|
||||
_texture(ir_txb, v110_derivatives_only_deprecated_texture, glsl_type::vec4_type, glsl_type::sampler1D_type, glsl_type::vec2_type, TEX_PROJECT),
|
||||
_texture(ir_txb, v110_derivatives_only_deprecated_texture, glsl_type::vec4_type, glsl_type::sampler1D_type, glsl_type::vec4_type, TEX_PROJECT),
|
||||
_texture(ir_tex, gpu_shader4_integer, glsl_type::ivec4_type, glsl_type::isampler1D_type, glsl_type::vec2_type, TEX_PROJECT),
|
||||
_texture(ir_tex, gpu_shader4_integer, glsl_type::ivec4_type, glsl_type::isampler1D_type, glsl_type::vec4_type, TEX_PROJECT),
|
||||
_texture(ir_txb, gpu_shader4_integer_derivs_only, glsl_type::ivec4_type, glsl_type::isampler1D_type, glsl_type::vec2_type, TEX_PROJECT),
|
||||
|
|
@ -3416,7 +3435,7 @@ builtin_builder::create_builtins()
|
|||
NULL);
|
||||
|
||||
add_function("texture1DLod",
|
||||
_texture(ir_txl, tex1d_lod, glsl_type::vec4_type, glsl_type::sampler1D_type, glsl_type::float_type),
|
||||
_texture(ir_txl, v110_lod_deprecated_texture, glsl_type::vec4_type, glsl_type::sampler1D_type, glsl_type::float_type),
|
||||
_texture(ir_txl, gpu_shader4_integer, glsl_type::ivec4_type, glsl_type::isampler1D_type, glsl_type::float_type),
|
||||
_texture(ir_txl, gpu_shader4_integer, glsl_type::uvec4_type, glsl_type::usampler1D_type, glsl_type::float_type),
|
||||
NULL);
|
||||
|
|
@ -3428,8 +3447,8 @@ builtin_builder::create_builtins()
|
|||
NULL);
|
||||
|
||||
add_function("texture1DProjLod",
|
||||
_texture(ir_txl, tex1d_lod, glsl_type::vec4_type, glsl_type::sampler1D_type, glsl_type::vec2_type, TEX_PROJECT),
|
||||
_texture(ir_txl, tex1d_lod, glsl_type::vec4_type, glsl_type::sampler1D_type, glsl_type::vec4_type, TEX_PROJECT),
|
||||
_texture(ir_txl, v110_lod_deprecated_texture, glsl_type::vec4_type, glsl_type::sampler1D_type, glsl_type::vec2_type, TEX_PROJECT),
|
||||
_texture(ir_txl, v110_lod_deprecated_texture, glsl_type::vec4_type, glsl_type::sampler1D_type, glsl_type::vec4_type, TEX_PROJECT),
|
||||
_texture(ir_txl, gpu_shader4_integer, glsl_type::ivec4_type, glsl_type::isampler1D_type, glsl_type::vec2_type, TEX_PROJECT),
|
||||
_texture(ir_txl, gpu_shader4_integer, glsl_type::ivec4_type, glsl_type::isampler1D_type, glsl_type::vec4_type, TEX_PROJECT),
|
||||
_texture(ir_txl, gpu_shader4_integer, glsl_type::uvec4_type, glsl_type::usampler1D_type, glsl_type::vec2_type, TEX_PROJECT),
|
||||
|
|
@ -3437,8 +3456,8 @@ builtin_builder::create_builtins()
|
|||
NULL);
|
||||
|
||||
add_function("texture2D",
|
||||
_texture(ir_tex, always_available, glsl_type::vec4_type, glsl_type::sampler2D_type, glsl_type::vec2_type),
|
||||
_texture(ir_txb, derivatives_only, glsl_type::vec4_type, glsl_type::sampler2D_type, glsl_type::vec2_type),
|
||||
_texture(ir_tex, deprecated_texture, glsl_type::vec4_type, glsl_type::sampler2D_type, glsl_type::vec2_type),
|
||||
_texture(ir_txb, deprecated_texture_derivatives_only, glsl_type::vec4_type, glsl_type::sampler2D_type, glsl_type::vec2_type),
|
||||
_texture(ir_tex, gpu_shader4_integer, glsl_type::ivec4_type, glsl_type::isampler2D_type, glsl_type::vec2_type),
|
||||
_texture(ir_txb, gpu_shader4_integer_derivs_only, glsl_type::ivec4_type, glsl_type::isampler2D_type, glsl_type::vec2_type),
|
||||
_texture(ir_tex, gpu_shader4_integer, glsl_type::uvec4_type, glsl_type::usampler2D_type, glsl_type::vec2_type),
|
||||
|
|
@ -3456,10 +3475,10 @@ builtin_builder::create_builtins()
|
|||
NULL);
|
||||
|
||||
add_function("texture2DProj",
|
||||
_texture(ir_tex, always_available, glsl_type::vec4_type, glsl_type::sampler2D_type, glsl_type::vec3_type, TEX_PROJECT),
|
||||
_texture(ir_tex, always_available, glsl_type::vec4_type, glsl_type::sampler2D_type, glsl_type::vec4_type, TEX_PROJECT),
|
||||
_texture(ir_txb, derivatives_only, glsl_type::vec4_type, glsl_type::sampler2D_type, glsl_type::vec3_type, TEX_PROJECT),
|
||||
_texture(ir_txb, derivatives_only, glsl_type::vec4_type, glsl_type::sampler2D_type, glsl_type::vec4_type, TEX_PROJECT),
|
||||
_texture(ir_tex, deprecated_texture, glsl_type::vec4_type, glsl_type::sampler2D_type, glsl_type::vec3_type, TEX_PROJECT),
|
||||
_texture(ir_tex, deprecated_texture, glsl_type::vec4_type, glsl_type::sampler2D_type, glsl_type::vec4_type, TEX_PROJECT),
|
||||
_texture(ir_txb, deprecated_texture_derivatives_only, glsl_type::vec4_type, glsl_type::sampler2D_type, glsl_type::vec3_type, TEX_PROJECT),
|
||||
_texture(ir_txb, deprecated_texture_derivatives_only, glsl_type::vec4_type, glsl_type::sampler2D_type, glsl_type::vec4_type, TEX_PROJECT),
|
||||
_texture(ir_tex, gpu_shader4_integer, glsl_type::ivec4_type, glsl_type::isampler2D_type, glsl_type::vec3_type, TEX_PROJECT),
|
||||
_texture(ir_tex, gpu_shader4_integer, glsl_type::ivec4_type, glsl_type::isampler2D_type, glsl_type::vec4_type, TEX_PROJECT),
|
||||
_texture(ir_txb, gpu_shader4_integer_derivs_only, glsl_type::ivec4_type, glsl_type::isampler2D_type, glsl_type::vec3_type, TEX_PROJECT),
|
||||
|
|
@ -3473,7 +3492,7 @@ builtin_builder::create_builtins()
|
|||
NULL);
|
||||
|
||||
add_function("texture2DLod",
|
||||
_texture(ir_txl, lod_exists_in_stage, glsl_type::vec4_type, glsl_type::sampler2D_type, glsl_type::vec2_type),
|
||||
_texture(ir_txl, lod_deprecated_texture, glsl_type::vec4_type, glsl_type::sampler2D_type, glsl_type::vec2_type),
|
||||
_texture(ir_txl, gpu_shader4_integer, glsl_type::ivec4_type, glsl_type::isampler2D_type, glsl_type::vec2_type),
|
||||
_texture(ir_txl, gpu_shader4_integer, glsl_type::uvec4_type, glsl_type::usampler2D_type, glsl_type::vec2_type),
|
||||
NULL);
|
||||
|
|
@ -3485,8 +3504,8 @@ builtin_builder::create_builtins()
|
|||
NULL);
|
||||
|
||||
add_function("texture2DProjLod",
|
||||
_texture(ir_txl, lod_exists_in_stage, glsl_type::vec4_type, glsl_type::sampler2D_type, glsl_type::vec3_type, TEX_PROJECT),
|
||||
_texture(ir_txl, lod_exists_in_stage, glsl_type::vec4_type, glsl_type::sampler2D_type, glsl_type::vec4_type, TEX_PROJECT),
|
||||
_texture(ir_txl, lod_deprecated_texture, glsl_type::vec4_type, glsl_type::sampler2D_type, glsl_type::vec3_type, TEX_PROJECT),
|
||||
_texture(ir_txl, lod_deprecated_texture, glsl_type::vec4_type, glsl_type::sampler2D_type, glsl_type::vec4_type, TEX_PROJECT),
|
||||
_texture(ir_txl, gpu_shader4_integer, glsl_type::ivec4_type, glsl_type::isampler2D_type, glsl_type::vec3_type, TEX_PROJECT),
|
||||
_texture(ir_txl, gpu_shader4_integer, glsl_type::ivec4_type, glsl_type::isampler2D_type, glsl_type::vec4_type, TEX_PROJECT),
|
||||
_texture(ir_txl, gpu_shader4_integer, glsl_type::uvec4_type, glsl_type::usampler2D_type, glsl_type::vec3_type, TEX_PROJECT),
|
||||
|
|
@ -3524,8 +3543,8 @@ builtin_builder::create_builtins()
|
|||
NULL);
|
||||
|
||||
add_function("textureCube",
|
||||
_texture(ir_tex, always_available, glsl_type::vec4_type, glsl_type::samplerCube_type, glsl_type::vec3_type),
|
||||
_texture(ir_txb, derivatives_only, glsl_type::vec4_type, glsl_type::samplerCube_type, glsl_type::vec3_type),
|
||||
_texture(ir_tex, deprecated_texture, glsl_type::vec4_type, glsl_type::samplerCube_type, glsl_type::vec3_type),
|
||||
_texture(ir_txb, deprecated_texture_derivatives_only, glsl_type::vec4_type, glsl_type::samplerCube_type, glsl_type::vec3_type),
|
||||
_texture(ir_tex, gpu_shader4_integer, glsl_type::ivec4_type, glsl_type::isamplerCube_type, glsl_type::vec3_type),
|
||||
_texture(ir_txb, gpu_shader4_integer_derivs_only, glsl_type::ivec4_type, glsl_type::isamplerCube_type, glsl_type::vec3_type),
|
||||
_texture(ir_tex, gpu_shader4_integer, glsl_type::uvec4_type, glsl_type::usamplerCube_type, glsl_type::vec3_type),
|
||||
|
|
@ -3533,7 +3552,7 @@ builtin_builder::create_builtins()
|
|||
NULL);
|
||||
|
||||
add_function("textureCubeLod",
|
||||
_texture(ir_txl, lod_exists_in_stage, glsl_type::vec4_type, glsl_type::samplerCube_type, glsl_type::vec3_type),
|
||||
_texture(ir_txl, lod_deprecated_texture, glsl_type::vec4_type, glsl_type::samplerCube_type, glsl_type::vec3_type),
|
||||
_texture(ir_txl, gpu_shader4_integer, glsl_type::ivec4_type, glsl_type::isamplerCube_type, glsl_type::vec3_type),
|
||||
_texture(ir_txl, gpu_shader4_integer, glsl_type::uvec4_type, glsl_type::usamplerCube_type, glsl_type::vec3_type),
|
||||
NULL);
|
||||
|
|
@ -3554,8 +3573,8 @@ builtin_builder::create_builtins()
|
|||
NULL);
|
||||
|
||||
add_function("shadow1D",
|
||||
_texture(ir_tex, v110, glsl_type::vec4_type, glsl_type::sampler1DShadow_type, glsl_type::vec3_type),
|
||||
_texture(ir_txb, v110_derivatives_only, glsl_type::vec4_type, glsl_type::sampler1DShadow_type, glsl_type::vec3_type),
|
||||
_texture(ir_tex, v110_deprecated_texture, glsl_type::vec4_type, glsl_type::sampler1DShadow_type, glsl_type::vec3_type),
|
||||
_texture(ir_txb, v110_derivatives_only_deprecated_texture, glsl_type::vec4_type, glsl_type::sampler1DShadow_type, glsl_type::vec3_type),
|
||||
NULL);
|
||||
|
||||
add_function("shadow1DArray",
|
||||
|
|
@ -3564,8 +3583,8 @@ builtin_builder::create_builtins()
|
|||
NULL);
|
||||
|
||||
add_function("shadow2D",
|
||||
_texture(ir_tex, v110, glsl_type::vec4_type, glsl_type::sampler2DShadow_type, glsl_type::vec3_type),
|
||||
_texture(ir_txb, v110_derivatives_only, glsl_type::vec4_type, glsl_type::sampler2DShadow_type, glsl_type::vec3_type),
|
||||
_texture(ir_tex, v110_deprecated_texture, glsl_type::vec4_type, glsl_type::sampler2DShadow_type, glsl_type::vec3_type),
|
||||
_texture(ir_txb, v110_derivatives_only_deprecated_texture, glsl_type::vec4_type, glsl_type::sampler2DShadow_type, glsl_type::vec3_type),
|
||||
NULL);
|
||||
|
||||
add_function("shadow2DArray",
|
||||
|
|
@ -3574,8 +3593,8 @@ builtin_builder::create_builtins()
|
|||
NULL);
|
||||
|
||||
add_function("shadow1DProj",
|
||||
_texture(ir_tex, v110, glsl_type::vec4_type, glsl_type::sampler1DShadow_type, glsl_type::vec4_type, TEX_PROJECT),
|
||||
_texture(ir_txb, v110_derivatives_only, glsl_type::vec4_type, glsl_type::sampler1DShadow_type, glsl_type::vec4_type, TEX_PROJECT),
|
||||
_texture(ir_tex, v110_deprecated_texture, glsl_type::vec4_type, glsl_type::sampler1DShadow_type, glsl_type::vec4_type, TEX_PROJECT),
|
||||
_texture(ir_txb, v110_derivatives_only_deprecated_texture, glsl_type::vec4_type, glsl_type::sampler1DShadow_type, glsl_type::vec4_type, TEX_PROJECT),
|
||||
NULL);
|
||||
|
||||
add_function("shadow2DArray",
|
||||
|
|
@ -3589,16 +3608,16 @@ builtin_builder::create_builtins()
|
|||
NULL);
|
||||
|
||||
add_function("shadow2DProj",
|
||||
_texture(ir_tex, v110, glsl_type::vec4_type, glsl_type::sampler2DShadow_type, glsl_type::vec4_type, TEX_PROJECT),
|
||||
_texture(ir_txb, v110_derivatives_only, glsl_type::vec4_type, glsl_type::sampler2DShadow_type, glsl_type::vec4_type, TEX_PROJECT),
|
||||
_texture(ir_tex, v110_deprecated_texture, glsl_type::vec4_type, glsl_type::sampler2DShadow_type, glsl_type::vec4_type, TEX_PROJECT),
|
||||
_texture(ir_txb, v110_derivatives_only_deprecated_texture, glsl_type::vec4_type, glsl_type::sampler2DShadow_type, glsl_type::vec4_type, TEX_PROJECT),
|
||||
NULL);
|
||||
|
||||
add_function("shadow1DLod",
|
||||
_texture(ir_txl, v110_lod, glsl_type::vec4_type, glsl_type::sampler1DShadow_type, glsl_type::vec3_type),
|
||||
_texture(ir_txl, v110_lod_deprecated_texture, glsl_type::vec4_type, glsl_type::sampler1DShadow_type, glsl_type::vec3_type),
|
||||
NULL);
|
||||
|
||||
add_function("shadow2DLod",
|
||||
_texture(ir_txl, v110_lod, glsl_type::vec4_type, glsl_type::sampler2DShadow_type, glsl_type::vec3_type),
|
||||
_texture(ir_txl, v110_lod_deprecated_texture, glsl_type::vec4_type, glsl_type::sampler2DShadow_type, glsl_type::vec3_type),
|
||||
NULL);
|
||||
|
||||
add_function("shadow1DArrayLod",
|
||||
|
|
@ -3606,11 +3625,11 @@ builtin_builder::create_builtins()
|
|||
NULL);
|
||||
|
||||
add_function("shadow1DProjLod",
|
||||
_texture(ir_txl, v110_lod, glsl_type::vec4_type, glsl_type::sampler1DShadow_type, glsl_type::vec4_type, TEX_PROJECT),
|
||||
_texture(ir_txl, v110_lod_deprecated_texture, glsl_type::vec4_type, glsl_type::sampler1DShadow_type, glsl_type::vec4_type, TEX_PROJECT),
|
||||
NULL);
|
||||
|
||||
add_function("shadow2DProjLod",
|
||||
_texture(ir_txl, v110_lod, glsl_type::vec4_type, glsl_type::sampler2DShadow_type, glsl_type::vec4_type, TEX_PROJECT),
|
||||
_texture(ir_txl, v110_lod_deprecated_texture, glsl_type::vec4_type, glsl_type::sampler2DShadow_type, glsl_type::vec4_type, TEX_PROJECT),
|
||||
NULL);
|
||||
|
||||
add_function("shadow2DRect",
|
||||
|
|
|
|||
Loading…
Reference in New Issue