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

glsl2: Hook up constant parameters in ir_to_mesa.

Browse Source
This commit is contained in:
Eric Anholt
2010-06-25 12:59:10 -07:00
parent ffc845a50a
commit 582b73fe69
1 changed files with 16 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
src/mesa/shader/ir_to_mesa.cpp
View File

@@ -56,7 +56,7 @@ extern "C" {
typedef struct ir_to_mesa_src_reg { typedef struct ir_to_mesa_src_reg {
int file; /**< PROGRAM_* from Mesa */ int file; /**< PROGRAM_* from Mesa */
int index; /**< temporary index, VERT_ATTRIB_*, FRAG_ATTRIB_*, etc. */ int index; /**< temporary index, VERT_ATTRIB_*, FRAG_ATTRIB_*, etc. */
int swizzle; /**< SWIZZLE_XYZWONEZERO swizzles from Mesa. */ GLuint swizzle; /**< SWIZZLE_XYZWONEZERO swizzles from Mesa. */
int negate; /**< NEGATE_XYZW mask from mesa */ int negate; /**< NEGATE_XYZW mask from mesa */
bool reladdr; /**< Register index should be offset by address reg. */ bool reladdr; /**< Register index should be offset by address reg. */
} ir_to_mesa_src_reg; } ir_to_mesa_src_reg;
@@ -319,14 +319,14 @@ ir_to_mesa_visitor::ir_to_mesa_emit_scalar_op1(ir_instruction *ir,
* dst channels. * dst channels.
*/ */
for (i = 0; i < 4; i++) { for (i = 0; i < 4; i++) {
int this_mask = (1 << i); GLuint this_mask = (1 << i);
ir_to_mesa_instruction *inst; ir_to_mesa_instruction *inst;
ir_to_mesa_src_reg src = src0; ir_to_mesa_src_reg src = src0;
if (done_mask & this_mask) if (done_mask & this_mask)
continue; continue;
int src_swiz = GET_SWZ(src.swizzle, i); GLuint src_swiz = GET_SWZ(src.swizzle, i);
for (j = i + 1; j < 4; j++) { for (j = i + 1; j < 4; j++) {
if (!(done_mask & (1 << j)) && GET_SWZ(src.swizzle, j) == src_swiz) { if (!(done_mask & (1 << j)) && GET_SWZ(src.swizzle, j) == src_swiz) {
this_mask |= (1 << j); this_mask |= (1 << j);
@@ -348,15 +348,9 @@ ir_to_mesa_visitor::src_reg_for_float(float val)
{ {
ir_to_mesa_src_reg src_reg; ir_to_mesa_src_reg src_reg;
/* FINISHME: This will end up being _mesa_add_unnamed_constant,
* which handles sharing values and sharing channels of vec4
* constants for small values.
*/
/* FINISHME: Do something with the constant values for now.
*/
(void)val;
src_reg.file = PROGRAM_CONSTANT; src_reg.file = PROGRAM_CONSTANT;
src_reg.index = this->next_constant++; src_reg.index = _mesa_add_unnamed_constant(this->prog->Parameters,
&val, 1, &src_reg.swizzle);
src_reg.swizzle = SWIZZLE_NOOP; src_reg.swizzle = SWIZZLE_NOOP;
return src_reg; return src_reg;
@@ -985,15 +979,17 @@ ir_to_mesa_visitor::visit(ir_constant *ir)
ir->type->base_type == GLSL_TYPE_INT || ir->type->base_type == GLSL_TYPE_INT ||
ir->type->base_type == GLSL_TYPE_BOOL); ir->type->base_type == GLSL_TYPE_BOOL);
/* FINISHME: This will end up being _mesa_add_unnamed_constant, if (ir->type->base_type == GLSL_TYPE_FLOAT &&
* which handles sharing values and sharing channels of vec4 !ir->type->is_matrix() && !ir->type->is_array()) {
* constants for small values. src_reg.file = PROGRAM_CONSTANT;
*/ src_reg.index =
/* FINISHME: Do something with the constant values for now. _mesa_add_unnamed_constant(this->prog->Parameters,
*/ &ir->value.f[0], ir->type->vector_elements,
src_reg.file = PROGRAM_CONSTANT; &src_reg.swizzle);
src_reg.index = this->next_constant; src_reg.swizzle = SWIZZLE_NOOP;
src_reg.swizzle = SWIZZLE_NOOP; } else {
assert(!"FINISHME: non-float constants");
}
src_reg.reladdr = false; src_reg.reladdr = false;
src_reg.negate = 0; src_reg.negate = 0;