projects
/
mesa.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
i965/blorp: Turn blorp_surface_info into a C-style struct
[mesa.git]
/
src
/
mesa
/
state_tracker
/
st_glsl_to_tgsi.cpp
diff --git
a/src/mesa/state_tracker/st_glsl_to_tgsi.cpp
b/src/mesa/state_tracker/st_glsl_to_tgsi.cpp
index 5f037daea76ed4e1434bd82aec2f30ccebc7ba21..ad818a8240beef8979c477a4a762885f16214715 100644
(file)
--- a/
src/mesa/state_tracker/st_glsl_to_tgsi.cpp
+++ b/
src/mesa/state_tracker/st_glsl_to_tgsi.cpp
@@
-5186,7
+5186,7
@@
struct st_translate {
unsigned insn_size;
unsigned insn_count;
unsigned insn_size;
unsigned insn_count;
- unsigned procType; /**<
TGSI_PROCESSO
R_VERTEX/FRAGMENT */
+ unsigned procType; /**<
PIPE_SHADE
R_VERTEX/FRAGMENT */
boolean error;
};
boolean error;
};
@@
-5379,10
+5379,10
@@
dst_register(struct st_translate *t, gl_register_file file, unsigned index,
case PROGRAM_OUTPUT:
if (!array_id) {
case PROGRAM_OUTPUT:
if (!array_id) {
- if (t->procType ==
TGSI_PROCESSO
R_FRAGMENT)
+ if (t->procType ==
PIPE_SHADE
R_FRAGMENT)
assert(index < FRAG_RESULT_MAX);
assert(index < FRAG_RESULT_MAX);
- else if (t->procType ==
TGSI_PROCESSO
R_TESS_CTRL ||
- t->procType ==
TGSI_PROCESSO
R_TESS_EVAL)
+ else if (t->procType ==
PIPE_SHADE
R_TESS_CTRL ||
+ t->procType ==
PIPE_SHADE
R_TESS_EVAL)
assert(index < VARYING_SLOT_TESS_MAX);
else
assert(index < VARYING_SLOT_MAX);
assert(index < VARYING_SLOT_TESS_MAX);
else
assert(index < VARYING_SLOT_MAX);
@@
-6048,7
+6048,7
@@
st_translate_program(
* Declare input attributes.
*/
switch (procType) {
* Declare input attributes.
*/
switch (procType) {
- case
TGSI_PROCESSO
R_FRAGMENT:
+ case
PIPE_SHADE
R_FRAGMENT:
for (i = 0; i < numInputs; i++) {
unsigned array_id = 0;
unsigned array_size;
for (i = 0; i < numInputs; i++) {
unsigned array_id = 0;
unsigned array_size;
@@
-6069,9
+6069,9
@@
st_translate_program(
}
}
break;
}
}
break;
- case
TGSI_PROCESSO
R_GEOMETRY:
- case
TGSI_PROCESSO
R_TESS_EVAL:
- case
TGSI_PROCESSO
R_TESS_CTRL:
+ case
PIPE_SHADE
R_GEOMETRY:
+ case
PIPE_SHADE
R_TESS_EVAL:
+ case
PIPE_SHADE
R_TESS_CTRL:
for (i = 0; i < numInputs; i++) {
unsigned array_id = 0;
unsigned array_size;
for (i = 0; i < numInputs; i++) {
unsigned array_id = 0;
unsigned array_size;
@@
-6090,12
+6090,12
@@
st_translate_program(
}
}
break;
}
}
break;
- case
TGSI_PROCESSO
R_VERTEX:
+ case
PIPE_SHADE
R_VERTEX:
for (i = 0; i < numInputs; i++) {
t->inputs[i] = ureg_DECL_vs_input(ureg, i);
}
break;
for (i = 0; i < numInputs; i++) {
t->inputs[i] = ureg_DECL_vs_input(ureg, i);
}
break;
- case
TGSI_PROCESSO
R_COMPUTE:
+ case
PIPE_SHADE
R_COMPUTE:
break;
default:
assert(0);
break;
default:
assert(0);
@@
-6105,13
+6105,13
@@
st_translate_program(
* Declare output attributes.
*/
switch (procType) {
* Declare output attributes.
*/
switch (procType) {
- case
TGSI_PROCESSO
R_FRAGMENT:
- case
TGSI_PROCESSO
R_COMPUTE:
+ case
PIPE_SHADE
R_FRAGMENT:
+ case
PIPE_SHADE
R_COMPUTE:
break;
break;
- case
TGSI_PROCESSO
R_GEOMETRY:
- case
TGSI_PROCESSO
R_TESS_EVAL:
- case
TGSI_PROCESSO
R_TESS_CTRL:
- case
TGSI_PROCESSO
R_VERTEX:
+ case
PIPE_SHADE
R_GEOMETRY:
+ case
PIPE_SHADE
R_TESS_EVAL:
+ case
PIPE_SHADE
R_TESS_CTRL:
+ case
PIPE_SHADE
R_VERTEX:
for (i = 0; i < numOutputs; i++) {
unsigned array_id = 0;
unsigned array_size;
for (i = 0; i < numOutputs; i++) {
unsigned array_id = 0;
unsigned array_size;
@@
-6136,7
+6136,7
@@
st_translate_program(
assert(0);
}
assert(0);
}
- if (procType ==
TGSI_PROCESSO
R_FRAGMENT) {
+ if (procType ==
PIPE_SHADE
R_FRAGMENT) {
if (program->shader->EarlyFragmentTests)
ureg_property(ureg, TGSI_PROPERTY_FS_EARLY_DEPTH_STENCIL, 1);
if (program->shader->EarlyFragmentTests)
ureg_property(ureg, TGSI_PROPERTY_FS_EARLY_DEPTH_STENCIL, 1);
@@
-6184,7
+6184,7
@@
st_translate_program(
}
}
}
}
}
}
- else if (procType ==
TGSI_PROCESSO
R_VERTEX) {
+ else if (procType ==
PIPE_SHADE
R_VERTEX) {
for (i = 0; i < numOutputs; i++) {
if (outputSemanticName[i] == TGSI_SEMANTIC_FOG) {
/* force register to contain a fog coordinate in the form (F, 0, 0, 1). */
for (i = 0; i < numOutputs; i++) {
if (outputSemanticName[i] == TGSI_SEMANTIC_FOG) {
/* force register to contain a fog coordinate in the form (F, 0, 0, 1). */
@@
-6196,7
+6196,7
@@
st_translate_program(
}
}
}
}
- if (procType ==
TGSI_PROCESSO
R_COMPUTE) {
+ if (procType ==
PIPE_SHADE
R_COMPUTE) {
emit_compute_block_size(proginfo, ureg);
}
emit_compute_block_size(proginfo, ureg);
}
@@
-6230,7
+6230,7
@@
st_translate_program(
*/
struct st_context *st = st_context(ctx);
struct pipe_screen *pscreen = st->pipe->screen;
*/
struct st_context *st = st_context(ctx);
struct pipe_screen *pscreen = st->pipe->screen;
- assert(procType ==
TGSI_PROCESSO
R_VERTEX);
+ assert(procType ==
PIPE_SHADE
R_VERTEX);
assert(pscreen->get_shader_param(pscreen, PIPE_SHADER_VERTEX, PIPE_SHADER_CAP_INTEGERS));
(void) pscreen;
if (!ctx->Const.NativeIntegers) {
assert(pscreen->get_shader_param(pscreen, PIPE_SHADER_VERTEX, PIPE_SHADER_CAP_INTEGERS));
(void) pscreen;
if (!ctx->Const.NativeIntegers) {
@@
-6240,7
+6240,7
@@
st_translate_program(
}
}
}
}
- if (procType ==
TGSI_PROCESSO
R_FRAGMENT &&
+ if (procType ==
PIPE_SHADE
R_FRAGMENT &&
semName == TGSI_SEMANTIC_POSITION)
emit_wpos(st_context(ctx), t, proginfo, ureg,
program->wpos_transform_const);
semName == TGSI_SEMANTIC_POSITION)
emit_wpos(st_context(ctx), t, proginfo, ureg,
program->wpos_transform_const);
@@
-6392,8
+6392,8
@@
st_translate_program(
/* Set the next shader stage hint for VS and TES. */
switch (procType) {
/* Set the next shader stage hint for VS and TES. */
switch (procType) {
- case
TGSI_PROCESSO
R_VERTEX:
- case
TGSI_PROCESSO
R_TESS_EVAL:
+ case
PIPE_SHADE
R_VERTEX:
+ case
PIPE_SHADE
R_TESS_EVAL:
if (program->shader_program->SeparateShader)
break;
if (program->shader_program->SeparateShader)
break;
@@
-6403,16
+6403,16
@@
st_translate_program(
switch (i) {
case MESA_SHADER_TESS_CTRL:
switch (i) {
case MESA_SHADER_TESS_CTRL:
- next =
TGSI_PROCESSO
R_TESS_CTRL;
+ next =
PIPE_SHADE
R_TESS_CTRL;
break;
case MESA_SHADER_TESS_EVAL:
break;
case MESA_SHADER_TESS_EVAL:
- next =
TGSI_PROCESSO
R_TESS_EVAL;
+ next =
PIPE_SHADE
R_TESS_EVAL;
break;
case MESA_SHADER_GEOMETRY:
break;
case MESA_SHADER_GEOMETRY:
- next =
TGSI_PROCESSO
R_GEOMETRY;
+ next =
PIPE_SHADE
R_GEOMETRY;
break;
case MESA_SHADER_FRAGMENT:
break;
case MESA_SHADER_FRAGMENT:
- next =
TGSI_PROCESSO
R_FRAGMENT;
+ next =
PIPE_SHADE
R_FRAGMENT;
break;
default:
assert(0);
break;
default:
assert(0);