fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-02-24 22:30:31 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

glsl/types: rename is_dual_slot_double to is_dual_slot_64bit.

Browse source 
In the future int64 support will have the same requirements.

Reviewed-by: Ilia Mirkin <imirkin@alum.mit.edu>
Signed-off-by: Dave Airlie <airlied@redhat.com>
This commit is contained in:
Dave Airlie 2016-06-09 07:50:43 +10:00
parent 45c901f7a3
commit 15896a470b
5 changed files with 10 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/compiler/glsl/ir_set_program_inouts.cpp
View file

@ -119,7 +119,7 @@ mark(struct gl_program *prog, ir_variable *var, int offset, int len,
/* double inputs read is only for vertex inputs */
if (stage == MESA_SHADER_VERTEX &&
var->type->without_array()->is_dual_slot_double())
var->type->without_array()->is_dual_slot())
prog->DoubleInputsRead |= bitfield;
if (stage == MESA_SHADER_FRAGMENT) {
@ -306,7 +306,7 @@ ir_set_program_inouts_visitor::try_mark_partial_variable(ir_variable *var,
/* double element width for double types that takes two slots */
if (this->shader_stage != MESA_SHADER_VERTEX ||
var->data.mode != ir_var_shader_in) {
if (type->without_array()->is_dual_slot_double())
if (type->without_array()->is_dual_slot())
elem_width *= 2;
}

4
src/compiler/glsl/linker.cpp
View file

@ -2863,7 +2863,7 @@ assign_attribute_or_color_locations(gl_shader_program *prog,
* issue (3) of the GL_ARB_vertex_attrib_64bit behavior, this
* is optional behavior, but it seems preferable.
*/
if (var->type->without_array()->is_dual_slot_double())
if (var->type->without_array()->is_dual_slot())
double_storage_locations |= (use_mask << attr);
}
@ -2940,7 +2940,7 @@ assign_attribute_or_color_locations(gl_shader_program *prog,
to_assign[i].var->data.is_unmatched_generic_inout = 0;
used_locations |= (use_mask << location);
if (to_assign[i].var->type->without_array()->is_dual_slot_double())
if (to_assign[i].var->type->without_array()->is_dual_slot())
double_storage_locations |= (use_mask << location);
}

6
src/compiler/glsl_types.h
View file

@ -495,11 +495,11 @@ struct glsl_type {
}
/**
* Query whether a double takes two slots.
* Query whether a 64-bit type takes two slots.
*/
bool is_dual_slot_double() const
bool is_dual_slot() const
{
return base_type == GLSL_TYPE_DOUBLE && vector_elements > 2;
return is_64bit() && vector_elements > 2;
}
/**

4
src/mesa/drivers/dri/i965/brw_vec4_visitor.cpp
View file

@ -585,7 +585,7 @@ type_size_xvec4(const struct glsl_type *type, bool as_vec4)
if (type->is_matrix()) {
const glsl_type *col_type = type->column_type();
unsigned col_slots =
(as_vec4 && col_type->is_dual_slot_double()) ? 2 : 1;
(as_vec4 && col_type->is_dual_slot()) ? 2 : 1;
return type->matrix_columns * col_slots;
} else {
/* Regardless of size of vector, it gets a vec4. This is bad
@ -593,7 +593,7 @@ type_size_xvec4(const struct glsl_type *type, bool as_vec4)
* mess. Hopefully a later pass over the code can pack scalars
* down if appropriate.
*/
return (as_vec4 && type->is_dual_slot_double()) ? 2 : 1;
return (as_vec4 && type->is_dual_slot()) ? 2 : 1;
}
case GLSL_TYPE_ARRAY:
assert(type->length > 0);

2
src/mesa/state_tracker/st_glsl_to_tgsi.cpp
View file

@ -2822,7 +2822,7 @@ glsl_to_tgsi_visitor::emit_block_mov(ir_assignment *ir, const struct glsl_type *
}
l->index++;
r->index++;
if (type->is_dual_slot_double()) {
if (type->is_dual_slot()) {
l->index++;
if (r->is_double_vertex_input == false)
r->index++;