glsl: remove redundant es_shader checks
The es check is already covered by the is_version() check. Reviewed-by: Ian Romanick <ian.d.romanick@intel.com>
This commit is contained in:
parent
cc2fe57922
commit
3bc012a34e
|
@ -314,10 +314,6 @@ apply_implicit_conversion(const glsl_type *to, ir_rvalue * &from,
|
||||||
if (!state->is_version(120, 0))
|
if (!state->is_version(120, 0))
|
||||||
return false;
|
return false;
|
||||||
|
|
||||||
/* ESSL does not allow implicit conversions */
|
|
||||||
if (state->es_shader)
|
|
||||||
return false;
|
|
||||||
|
|
||||||
/* From page 27 (page 33 of the PDF) of the GLSL 1.50 spec:
|
/* From page 27 (page 33 of the PDF) of the GLSL 1.50 spec:
|
||||||
*
|
*
|
||||||
* "There are no implicit array or structure conversions. For
|
* "There are no implicit array or structure conversions. For
|
||||||
|
|
|
@ -1425,7 +1425,7 @@ glsl_type::can_implicitly_convert_to(const glsl_type *desired,
|
||||||
* state, we're doing intra-stage function linking where these checks have
|
* state, we're doing intra-stage function linking where these checks have
|
||||||
* already been done.
|
* already been done.
|
||||||
*/
|
*/
|
||||||
if (state && (state->es_shader || !state->is_version(120, 0)))
|
if (state && !state->is_version(120, 0))
|
||||||
return false;
|
return false;
|
||||||
|
|
||||||
/* There is no conversion among matrix types. */
|
/* There is no conversion among matrix types. */
|
||||||
|
|
Loading…
Reference in New Issue