OpenHarmony/third_party_mesa3d
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

glsl/ast: Implicit conversion from double to float is not allowed

Browse Source 
Also, renamed get_conversion_operation to avoid
future misunderstandings.

Signed-off-by: Andres Gomez <agomez@igalia.com>
Reviewed-by: Kenneth Graunke <kenneth@whitecape.org>
This commit is contained in:
Andres Gomez
2016-02-25 12:49:24 +02:00
committed by Samuel Iglesias Gonsálvez
parent 439b5b008f
commit d1509a5848
1 changed files with 3 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/compiler/glsl/ast_to_hir.cpp
View File

@@ -231,15 +231,14 @@ _mesa_ast_to_hir(exec_list *instructions, struct _mesa_glsl_parse_state *state)
static ir_expression_operation static ir_expression_operation
get_conversion_operation(const glsl_type *to, const glsl_type *from, get_implicit_conversion_operation(const glsl_type *to, const glsl_type *from,
struct _mesa_glsl_parse_state *state) struct _mesa_glsl_parse_state *state)
{ {
switch (to->base_type) { switch (to->base_type) {
case GLSL_TYPE_FLOAT: case GLSL_TYPE_FLOAT:
switch (from->base_type) { switch (from->base_type) {
case GLSL_TYPE_INT: return ir_unop_i2f; case GLSL_TYPE_INT: return ir_unop_i2f;
case GLSL_TYPE_UINT: return ir_unop_u2f; case GLSL_TYPE_UINT: return ir_unop_u2f;
case GLSL_TYPE_DOUBLE: return ir_unop_d2f;
default: return (ir_expression_operation)0; default: return (ir_expression_operation)0;
} }
@@ -311,7 +310,7 @@ apply_implicit_conversion(const glsl_type *to, ir_rvalue * &from,
to = glsl_type::get_instance(to->base_type, from->type->vector_elements, to = glsl_type::get_instance(to->base_type, from->type->vector_elements,
from->type->matrix_columns); from->type->matrix_columns);
ir_expression_operation op = get_conversion_operation(to, from->type, state); ir_expression_operation op = get_implicit_conversion_operation(to, from->type, state);
if (op) { if (op) {
from = new(ctx) ir_expression(op, to, from, NULL); from = new(ctx) ir_expression(op, to, from, NULL);
return true; return true;