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

st/mesa: add conversion for tessellation shaders

Browse Source 
Based on code from Ilia Mirkin <imirkin@alum.mit.edu>.
This commit is contained in:
Marek Olšák
2015-02-22 20:44:39 +01:00
parent ba9fb96f86
commit a58a66fe85
2 changed files with 274 additions and 98 deletions
Download Patch File Download Diff File Expand all files Collapse all files

65
src/mesa/state_tracker/st_glsl_to_tgsi.cpp
View File

@@ -2243,7 +2243,10 @@ is_inout_array(unsigned stage, ir_variable *var, bool *is_2d)
*is_2d = false; *is_2d = false;
if (stage == MESA_SHADER_GEOMETRY && var->data.mode == ir_var_shader_in) { if (((stage == MESA_SHADER_GEOMETRY && var->data.mode == ir_var_shader_in) ||
(stage == MESA_SHADER_TESS_EVAL && var->data.mode == ir_var_shader_in) ||
stage == MESA_SHADER_TESS_CTRL) &&
!var->data.patch) {
if (!var->type->is_array()) if (!var->type->is_array())
return false; /* a system value probably */ return false; /* a system value probably */
@@ -2355,7 +2358,8 @@ glsl_to_tgsi_visitor::visit(ir_dereference_variable *ir)
static void static void
shrink_array_declarations(struct array_decl *arrays, unsigned count, shrink_array_declarations(struct array_decl *arrays, unsigned count,
GLbitfield64 usage_mask) GLbitfield64 usage_mask,
GLbitfield patch_usage_mask)
{ {
unsigned i, j; unsigned i, j;
@@ -2367,8 +2371,15 @@ shrink_array_declarations(struct array_decl *arrays, unsigned count,
/* Shrink the beginning. */ /* Shrink the beginning. */
for (j = 0; j < decl->array_size; j++) { for (j = 0; j < decl->array_size; j++) {
if (usage_mask & BITFIELD64_BIT(decl->mesa_index+j)) if (decl->mesa_index >= VARYING_SLOT_PATCH0) {
break; if (patch_usage_mask &
BITFIELD64_BIT(decl->mesa_index - VARYING_SLOT_PATCH0 + j))
break;
}
else {
if (usage_mask & BITFIELD64_BIT(decl->mesa_index+j))
break;
}
decl->mesa_index++; decl->mesa_index++;
decl->array_size--; decl->array_size--;
@@ -2377,8 +2388,15 @@ shrink_array_declarations(struct array_decl *arrays, unsigned count,
/* Shrink the end. */ /* Shrink the end. */
for (j = decl->array_size-1; j >= 0; j--) { for (j = decl->array_size-1; j >= 0; j--) {
if (usage_mask & BITFIELD64_BIT(decl->mesa_index+j)) if (decl->mesa_index >= VARYING_SLOT_PATCH0) {
break; if (patch_usage_mask &
BITFIELD64_BIT(decl->mesa_index - VARYING_SLOT_PATCH0 + j))
break;
}
else {
if (usage_mask & BITFIELD64_BIT(decl->mesa_index+j))
break;
}
decl->array_size--; decl->array_size--;
} }
@@ -3553,7 +3571,7 @@ glsl_to_tgsi_visitor::simplify_cmp(void)
{ {
int tempWritesSize = 0; int tempWritesSize = 0;
unsigned *tempWrites = NULL; unsigned *tempWrites = NULL;
unsigned outputWrites[MAX_PROGRAM_OUTPUTS]; unsigned outputWrites[VARYING_SLOT_TESS_MAX];
memset(outputWrites, 0, sizeof(outputWrites)); memset(outputWrites, 0, sizeof(outputWrites));
@@ -3573,7 +3591,7 @@ glsl_to_tgsi_visitor::simplify_cmp(void)
} }
if (inst->dst[0].file == PROGRAM_OUTPUT) { if (inst->dst[0].file == PROGRAM_OUTPUT) {
assert(inst->dst[0].index < MAX_PROGRAM_OUTPUTS); assert(inst->dst[0].index < (signed)ARRAY_SIZE(outputWrites));
prevWriteMask = outputWrites[inst->dst[0].index]; prevWriteMask = outputWrites[inst->dst[0].index];
outputWrites[inst->dst[0].index] |= inst->dst[0].writemask; outputWrites[inst->dst[0].index] |= inst->dst[0].writemask;
} else if (inst->dst[0].file == PROGRAM_TEMPORARY) { } else if (inst->dst[0].file == PROGRAM_TEMPORARY) {
@@ -4527,6 +4545,14 @@ const unsigned _mesa_sysval_to_semantic[SYSTEM_VALUE_MAX] = {
TGSI_SEMANTIC_SAMPLEID, TGSI_SEMANTIC_SAMPLEID,
TGSI_SEMANTIC_SAMPLEPOS, TGSI_SEMANTIC_SAMPLEPOS,
TGSI_SEMANTIC_SAMPLEMASK, TGSI_SEMANTIC_SAMPLEMASK,
/* Tessellation shaders
*/
TGSI_SEMANTIC_TESSCOORD,
TGSI_SEMANTIC_VERTICESIN,
TGSI_SEMANTIC_PRIMID,
TGSI_SEMANTIC_TESSOUTER,
TGSI_SEMANTIC_TESSINNER,
}; };
/** /**
@@ -4651,6 +4677,9 @@ dst_register(struct st_translate *t, gl_register_file file, unsigned index,
if (!array_id) { if (!array_id) {
if (t->procType == TGSI_PROCESSOR_FRAGMENT) if (t->procType == TGSI_PROCESSOR_FRAGMENT)
assert(index < FRAG_RESULT_MAX); assert(index < FRAG_RESULT_MAX);
else if (t->procType == TGSI_PROCESSOR_TESS_CTRL ||
t->procType == TGSI_PROCESSOR_TESS_EVAL)
assert(index < VARYING_SLOT_TESS_MAX);
else else
assert(index < VARYING_SLOT_MAX); assert(index < VARYING_SLOT_MAX);
@@ -5271,6 +5300,8 @@ st_translate_program(
TGSI_SEMANTIC_VERTEXID_NOBASE); TGSI_SEMANTIC_VERTEXID_NOBASE);
assert(_mesa_sysval_to_semantic[SYSTEM_VALUE_BASE_VERTEX] == assert(_mesa_sysval_to_semantic[SYSTEM_VALUE_BASE_VERTEX] ==
TGSI_SEMANTIC_BASEVERTEX); TGSI_SEMANTIC_BASEVERTEX);
assert(_mesa_sysval_to_semantic[SYSTEM_VALUE_TESS_COORD] ==
TGSI_SEMANTIC_TESSCOORD);
t = CALLOC_STRUCT(st_translate); t = CALLOC_STRUCT(st_translate);
if (!t) { if (!t) {
@@ -5313,6 +5344,8 @@ st_translate_program(
} }
break; break;
case TGSI_PROCESSOR_GEOMETRY: case TGSI_PROCESSOR_GEOMETRY:
case TGSI_PROCESSOR_TESS_EVAL:
case TGSI_PROCESSOR_TESS_CTRL:
for (i = 0; i < numInputs; i++) { for (i = 0; i < numInputs; i++) {
unsigned array_id = 0; unsigned array_id = 0;
unsigned array_size; unsigned array_size;
@@ -5347,6 +5380,8 @@ st_translate_program(
case TGSI_PROCESSOR_FRAGMENT: case TGSI_PROCESSOR_FRAGMENT:
break; break;
case TGSI_PROCESSOR_GEOMETRY: case TGSI_PROCESSOR_GEOMETRY:
case TGSI_PROCESSOR_TESS_EVAL:
case TGSI_PROCESSOR_TESS_CTRL:
case TGSI_PROCESSOR_VERTEX: case TGSI_PROCESSOR_VERTEX:
for (i = 0; i < numOutputs; i++) { for (i = 0; i < numOutputs; i++) {
unsigned array_id = 0; unsigned array_id = 0;
@@ -5750,9 +5785,9 @@ get_mesa_program(struct gl_context *ctx,
do_set_program_inouts(shader->ir, prog, shader->Stage); do_set_program_inouts(shader->ir, prog, shader->Stage);
shrink_array_declarations(v->input_arrays, v->num_input_arrays, shrink_array_declarations(v->input_arrays, v->num_input_arrays,
prog->InputsRead); prog->InputsRead, prog->PatchInputsRead);
shrink_array_declarations(v->output_arrays, v->num_output_arrays, shrink_array_declarations(v->output_arrays, v->num_output_arrays,
prog->OutputsWritten); prog->OutputsWritten, prog->PatchOutputsWritten);
count_resources(v, prog); count_resources(v, prog);
/* This must be done before the uniform storage is associated. */ /* This must be done before the uniform storage is associated. */
@@ -5781,6 +5816,8 @@ get_mesa_program(struct gl_context *ctx,
struct st_vertex_program *stvp; struct st_vertex_program *stvp;
struct st_fragment_program *stfp; struct st_fragment_program *stfp;
struct st_geometry_program *stgp; struct st_geometry_program *stgp;
struct st_tessctrl_program *sttcp;
struct st_tesseval_program *sttep;
switch (shader->Type) { switch (shader->Type) {
case GL_VERTEX_SHADER: case GL_VERTEX_SHADER:
@@ -5795,6 +5832,14 @@ get_mesa_program(struct gl_context *ctx,
stgp = (struct st_geometry_program *)prog; stgp = (struct st_geometry_program *)prog;
stgp->glsl_to_tgsi = v; stgp->glsl_to_tgsi = v;
break; break;
case GL_TESS_CONTROL_SHADER:
sttcp = (struct st_tessctrl_program *)prog;
sttcp->glsl_to_tgsi = v;
break;
case GL_TESS_EVALUATION_SHADER:
sttep = (struct st_tesseval_program *)prog;
sttep->glsl_to_tgsi = v;
break;
default: default:
assert(!"should not be reached"); assert(!"should not be reached");
return NULL; return NULL;

307
src/mesa/state_tracker/st_program.c
View File

@@ -932,61 +932,52 @@ st_get_fp_variant(struct st_context *st,
/** /**
* Translate a geometry program to create a new variant. * Translate a program. This is common code for geometry and tessellation
* shaders.
*/ */
static struct st_gp_variant * static void
st_translate_geometry_program(struct st_context *st, st_translate_program_common(struct st_context *st,
struct st_geometry_program *stgp, struct gl_program *prog,
const struct st_gp_variant_key *key) struct glsl_to_tgsi_visitor *glsl_to_tgsi,
struct ureg_program *ureg,
unsigned tgsi_processor,
struct pipe_shader_state *out_state)
{ {
GLuint inputSlotToAttr[VARYING_SLOT_MAX]; GLuint inputSlotToAttr[VARYING_SLOT_TESS_MAX];
GLuint inputMapping[VARYING_SLOT_MAX]; GLuint inputMapping[VARYING_SLOT_TESS_MAX];
GLuint outputSlotToAttr[VARYING_SLOT_MAX]; GLuint outputSlotToAttr[VARYING_SLOT_TESS_MAX];
GLuint outputMapping[VARYING_SLOT_MAX]; GLuint outputMapping[VARYING_SLOT_TESS_MAX];
struct pipe_context *pipe = st->pipe;
GLuint attr; GLuint attr;
uint gs_num_inputs = 0;
ubyte input_semantic_name[PIPE_MAX_SHADER_INPUTS]; ubyte input_semantic_name[PIPE_MAX_SHADER_INPUTS];
ubyte input_semantic_index[PIPE_MAX_SHADER_INPUTS]; ubyte input_semantic_index[PIPE_MAX_SHADER_INPUTS];
uint num_inputs = 0;
ubyte gs_output_semantic_name[PIPE_MAX_SHADER_OUTPUTS]; ubyte output_semantic_name[PIPE_MAX_SHADER_OUTPUTS];
ubyte gs_output_semantic_index[PIPE_MAX_SHADER_OUTPUTS]; ubyte output_semantic_index[PIPE_MAX_SHADER_OUTPUTS];
uint gs_num_outputs = 0; uint num_outputs = 0;
GLint i; GLint i;
struct ureg_program *ureg;
struct pipe_shader_state state = {0};
struct st_gp_variant *gpv;
gpv = CALLOC_STRUCT(st_gp_variant);
if (!gpv)
return NULL;
ureg = ureg_create_with_screen(TGSI_PROCESSOR_GEOMETRY, st->pipe->screen);
if (ureg == NULL) {
free(gpv);
return NULL;
}
memset(inputSlotToAttr, 0, sizeof(inputSlotToAttr)); memset(inputSlotToAttr, 0, sizeof(inputSlotToAttr));
memset(inputMapping, 0, sizeof(inputMapping)); memset(inputMapping, 0, sizeof(inputMapping));
memset(outputSlotToAttr, 0, sizeof(outputSlotToAttr)); memset(outputSlotToAttr, 0, sizeof(outputSlotToAttr));
memset(outputMapping, 0, sizeof(outputMapping)); memset(outputMapping, 0, sizeof(outputMapping));
memset(out_state, 0, sizeof(*out_state));
/* /*
* Convert Mesa program inputs to TGSI input register semantics. * Convert Mesa program inputs to TGSI input register semantics.
*/ */
for (attr = 0; attr < VARYING_SLOT_MAX; attr++) { for (attr = 0; attr < VARYING_SLOT_MAX; attr++) {
if ((stgp->Base.Base.InputsRead & BITFIELD64_BIT(attr)) != 0) { if ((prog->InputsRead & BITFIELD64_BIT(attr)) != 0) {
const GLuint slot = gs_num_inputs++; const GLuint slot = num_inputs++;
inputMapping[attr] = slot; inputMapping[attr] = slot;
inputSlotToAttr[slot] = attr; inputSlotToAttr[slot] = attr;
switch (attr) { switch (attr) {
case VARYING_SLOT_PRIMITIVE_ID: case VARYING_SLOT_PRIMITIVE_ID:
assert(tgsi_processor == TGSI_PROCESSOR_GEOMETRY);
input_semantic_name[slot] = TGSI_SEMANTIC_PRIMID; input_semantic_name[slot] = TGSI_SEMANTIC_PRIMID;
input_semantic_index[slot] = 0; input_semantic_index[slot] = 0;
break; break;
@@ -1038,19 +1029,33 @@ st_translate_geometry_program(struct st_context *st,
/* fall through */ /* fall through */
case VARYING_SLOT_VAR0: case VARYING_SLOT_VAR0:
default: default:
assert(attr >= VARYING_SLOT_VAR0 && attr < VARYING_SLOT_MAX); assert(attr >= VARYING_SLOT_VAR0 ||
(attr >= VARYING_SLOT_TEX0 && attr <= VARYING_SLOT_TEX7));
input_semantic_name[slot] = TGSI_SEMANTIC_GENERIC; input_semantic_name[slot] = TGSI_SEMANTIC_GENERIC;
input_semantic_index[slot] = input_semantic_index[slot] =
st_get_generic_varying_index(st, attr); st_get_generic_varying_index(st, attr);
break; break;
} }
} }
} }
/* Also add patch inputs. */
for (attr = 0; attr < 32; attr++) {
if (prog->PatchInputsRead & (1 << attr)) {
GLuint slot = num_inputs++;
GLuint patch_attr = VARYING_SLOT_PATCH0 + attr;
inputMapping[patch_attr] = slot;
inputSlotToAttr[slot] = patch_attr;
input_semantic_name[slot] = TGSI_SEMANTIC_PATCH;
input_semantic_index[slot] = attr;
}
}
/* initialize output semantics to defaults */ /* initialize output semantics to defaults */
for (i = 0; i < PIPE_MAX_SHADER_OUTPUTS; i++) { for (i = 0; i < PIPE_MAX_SHADER_OUTPUTS; i++) {
gs_output_semantic_name[i] = TGSI_SEMANTIC_GENERIC; output_semantic_name[i] = TGSI_SEMANTIC_GENERIC;
gs_output_semantic_index[i] = 0; output_semantic_index[i] = 0;
} }
/* /*
@@ -1058,8 +1063,8 @@ st_translate_geometry_program(struct st_context *st,
* mapping and the semantic information for each output. * mapping and the semantic information for each output.
*/ */
for (attr = 0; attr < VARYING_SLOT_MAX; attr++) { for (attr = 0; attr < VARYING_SLOT_MAX; attr++) {
if (stgp->Base.Base.OutputsWritten & BITFIELD64_BIT(attr)) { if (prog->OutputsWritten & BITFIELD64_BIT(attr)) {
GLuint slot = gs_num_outputs++; GLuint slot = num_outputs++;
outputMapping[attr] = slot; outputMapping[attr] = slot;
outputSlotToAttr[slot] = attr; outputSlotToAttr[slot] = attr;
@@ -1067,56 +1072,64 @@ st_translate_geometry_program(struct st_context *st,
switch (attr) { switch (attr) {
case VARYING_SLOT_POS: case VARYING_SLOT_POS:
assert(slot == 0); assert(slot == 0);
gs_output_semantic_name[slot] = TGSI_SEMANTIC_POSITION; output_semantic_name[slot] = TGSI_SEMANTIC_POSITION;
gs_output_semantic_index[slot] = 0; output_semantic_index[slot] = 0;
break; break;
case VARYING_SLOT_COL0: case VARYING_SLOT_COL0:
gs_output_semantic_name[slot] = TGSI_SEMANTIC_COLOR; output_semantic_name[slot] = TGSI_SEMANTIC_COLOR;
gs_output_semantic_index[slot] = 0; output_semantic_index[slot] = 0;
break; break;
case VARYING_SLOT_COL1: case VARYING_SLOT_COL1:
gs_output_semantic_name[slot] = TGSI_SEMANTIC_COLOR; output_semantic_name[slot] = TGSI_SEMANTIC_COLOR;
gs_output_semantic_index[slot] = 1; output_semantic_index[slot] = 1;
break; break;
case VARYING_SLOT_BFC0: case VARYING_SLOT_BFC0:
gs_output_semantic_name[slot] = TGSI_SEMANTIC_BCOLOR; output_semantic_name[slot] = TGSI_SEMANTIC_BCOLOR;
gs_output_semantic_index[slot] = 0; output_semantic_index[slot] = 0;
break; break;
case VARYING_SLOT_BFC1: case VARYING_SLOT_BFC1:
gs_output_semantic_name[slot] = TGSI_SEMANTIC_BCOLOR; output_semantic_name[slot] = TGSI_SEMANTIC_BCOLOR;
gs_output_semantic_index[slot] = 1; output_semantic_index[slot] = 1;
break; break;
case VARYING_SLOT_FOGC: case VARYING_SLOT_FOGC:
gs_output_semantic_name[slot] = TGSI_SEMANTIC_FOG; output_semantic_name[slot] = TGSI_SEMANTIC_FOG;
gs_output_semantic_index[slot] = 0; output_semantic_index[slot] = 0;
break; break;
case VARYING_SLOT_PSIZ: case VARYING_SLOT_PSIZ:
gs_output_semantic_name[slot] = TGSI_SEMANTIC_PSIZE; output_semantic_name[slot] = TGSI_SEMANTIC_PSIZE;
gs_output_semantic_index[slot] = 0; output_semantic_index[slot] = 0;
break; break;
case VARYING_SLOT_CLIP_VERTEX: case VARYING_SLOT_CLIP_VERTEX:
gs_output_semantic_name[slot] = TGSI_SEMANTIC_CLIPVERTEX; output_semantic_name[slot] = TGSI_SEMANTIC_CLIPVERTEX;
gs_output_semantic_index[slot] = 0; output_semantic_index[slot] = 0;
break; break;
case VARYING_SLOT_CLIP_DIST0: case VARYING_SLOT_CLIP_DIST0:
gs_output_semantic_name[slot] = TGSI_SEMANTIC_CLIPDIST; output_semantic_name[slot] = TGSI_SEMANTIC_CLIPDIST;
gs_output_semantic_index[slot] = 0; output_semantic_index[slot] = 0;
break; break;
case VARYING_SLOT_CLIP_DIST1: case VARYING_SLOT_CLIP_DIST1:
gs_output_semantic_name[slot] = TGSI_SEMANTIC_CLIPDIST; output_semantic_name[slot] = TGSI_SEMANTIC_CLIPDIST;
gs_output_semantic_index[slot] = 1; output_semantic_index[slot] = 1;
break; break;
case VARYING_SLOT_LAYER: case VARYING_SLOT_LAYER:
gs_output_semantic_name[slot] = TGSI_SEMANTIC_LAYER; output_semantic_name[slot] = TGSI_SEMANTIC_LAYER;
gs_output_semantic_index[slot] = 0; output_semantic_index[slot] = 0;
break; break;
case VARYING_SLOT_PRIMITIVE_ID: case VARYING_SLOT_PRIMITIVE_ID:
gs_output_semantic_name[slot] = TGSI_SEMANTIC_PRIMID; output_semantic_name[slot] = TGSI_SEMANTIC_PRIMID;
gs_output_semantic_index[slot] = 0; output_semantic_index[slot] = 0;
break; break;
case VARYING_SLOT_VIEWPORT: case VARYING_SLOT_VIEWPORT:
gs_output_semantic_name[slot] = TGSI_SEMANTIC_VIEWPORT_INDEX; output_semantic_name[slot] = TGSI_SEMANTIC_VIEWPORT_INDEX;
gs_output_semantic_index[slot] = 0; output_semantic_index[slot] = 0;
break;
case VARYING_SLOT_TESS_LEVEL_OUTER:
output_semantic_name[slot] = TGSI_SEMANTIC_TESSOUTER;
output_semantic_index[slot] = 0;
break;
case VARYING_SLOT_TESS_LEVEL_INNER:
output_semantic_name[slot] = TGSI_SEMANTIC_TESSINNER;
output_semantic_index[slot] = 0;
break; break;
case VARYING_SLOT_TEX0: case VARYING_SLOT_TEX0:
case VARYING_SLOT_TEX1: case VARYING_SLOT_TEX1:
@@ -1127,36 +1140,44 @@ st_translate_geometry_program(struct st_context *st,
case VARYING_SLOT_TEX6: case VARYING_SLOT_TEX6:
case VARYING_SLOT_TEX7: case VARYING_SLOT_TEX7:
if (st->needs_texcoord_semantic) { if (st->needs_texcoord_semantic) {
gs_output_semantic_name[slot] = TGSI_SEMANTIC_TEXCOORD; output_semantic_name[slot] = TGSI_SEMANTIC_TEXCOORD;
gs_output_semantic_index[slot] = attr - VARYING_SLOT_TEX0; output_semantic_index[slot] = attr - VARYING_SLOT_TEX0;
break; break;
} }
/* fall through */ /* fall through */
case VARYING_SLOT_VAR0: case VARYING_SLOT_VAR0:
default: default:
assert(slot < ARRAY_SIZE(gs_output_semantic_name)); assert(slot < ARRAY_SIZE(output_semantic_name));
assert(attr >= VARYING_SLOT_VAR0); assert(attr >= VARYING_SLOT_VAR0 ||
gs_output_semantic_name[slot] = TGSI_SEMANTIC_GENERIC; (attr >= VARYING_SLOT_TEX0 && attr <= VARYING_SLOT_TEX7));
gs_output_semantic_index[slot] = output_semantic_name[slot] = TGSI_SEMANTIC_GENERIC;
output_semantic_index[slot] =
st_get_generic_varying_index(st, attr); st_get_generic_varying_index(st, attr);
break; break;
} }
} }
} }
ureg_property(ureg, TGSI_PROPERTY_GS_INPUT_PRIM, stgp->Base.InputType); /* Also add patch outputs. */
ureg_property(ureg, TGSI_PROPERTY_GS_OUTPUT_PRIM, stgp->Base.OutputType); for (attr = 0; attr < 32; attr++) {
ureg_property(ureg, TGSI_PROPERTY_GS_MAX_OUTPUT_VERTICES, if (prog->PatchOutputsWritten & (1 << attr)) {
stgp->Base.VerticesOut); GLuint slot = num_outputs++;
ureg_property(ureg, TGSI_PROPERTY_GS_INVOCATIONS, stgp->Base.Invocations); GLuint patch_attr = VARYING_SLOT_PATCH0 + attr;
outputMapping[patch_attr] = slot;
outputSlotToAttr[slot] = patch_attr;
output_semantic_name[slot] = TGSI_SEMANTIC_PATCH;
output_semantic_index[slot] = attr;
}
}
st_translate_program(st->ctx, st_translate_program(st->ctx,
TGSI_PROCESSOR_GEOMETRY, tgsi_processor,
ureg, ureg,
stgp->glsl_to_tgsi, glsl_to_tgsi,
&stgp->Base.Base, prog,
/* inputs */ /* inputs */
gs_num_inputs, num_inputs,
inputMapping, inputMapping,
inputSlotToAttr, inputSlotToAttr,
input_semantic_name, input_semantic_name,
@@ -1164,30 +1185,64 @@ st_translate_geometry_program(struct st_context *st,
NULL, NULL,
NULL, NULL,
/* outputs */ /* outputs */
gs_num_outputs, num_outputs,
outputMapping, outputMapping,
outputSlotToAttr, outputSlotToAttr,
gs_output_semantic_name, output_semantic_name,
gs_output_semantic_index, output_semantic_index,
FALSE, FALSE,
FALSE); FALSE);
state.tokens = ureg_get_tokens(ureg, NULL); out_state->tokens = ureg_get_tokens(ureg, NULL);
ureg_destroy(ureg); ureg_destroy(ureg);
st_translate_stream_output_info(stgp->glsl_to_tgsi, st_translate_stream_output_info(glsl_to_tgsi,
outputMapping, outputMapping,
&state.stream_output); &out_state->stream_output);
if ((ST_DEBUG & DEBUG_TGSI) && (ST_DEBUG & DEBUG_MESA)) { if ((ST_DEBUG & DEBUG_TGSI) && (ST_DEBUG & DEBUG_MESA)) {
_mesa_print_program(&stgp->Base.Base); _mesa_print_program(prog);
debug_printf("\n"); debug_printf("\n");
} }
if (ST_DEBUG & DEBUG_TGSI) { if (ST_DEBUG & DEBUG_TGSI) {
tgsi_dump(state.tokens, 0); tgsi_dump(out_state->tokens, 0);
debug_printf("\n"); debug_printf("\n");
} }
}
/**
* Translate a geometry program to create a new variant.
*/
static struct st_gp_variant *
st_translate_geometry_program(struct st_context *st,
struct st_geometry_program *stgp,
const struct st_gp_variant_key *key)
{
struct pipe_context *pipe = st->pipe;
struct ureg_program *ureg;
struct st_gp_variant *gpv;
struct pipe_shader_state state;
ureg = ureg_create_with_screen(TGSI_PROCESSOR_GEOMETRY, st->pipe->screen);
if (ureg == NULL)
return NULL;
ureg_property(ureg, TGSI_PROPERTY_GS_INPUT_PRIM, stgp->Base.InputType);
ureg_property(ureg, TGSI_PROPERTY_GS_OUTPUT_PRIM, stgp->Base.OutputType);
ureg_property(ureg, TGSI_PROPERTY_GS_MAX_OUTPUT_VERTICES,
stgp->Base.VerticesOut);
ureg_property(ureg, TGSI_PROPERTY_GS_INVOCATIONS, stgp->Base.Invocations);
st_translate_program_common(st, &stgp->Base.Base, stgp->glsl_to_tgsi, ureg,
TGSI_PROCESSOR_GEOMETRY, &state);
gpv = CALLOC_STRUCT(st_gp_variant);
if (!gpv) {
ureg_free_tokens(state.tokens);
return NULL;
}
/* fill in new variant */ /* fill in new variant */
gpv->driver_shader = pipe->create_gs_state(pipe, &state); gpv->driver_shader = pipe->create_gs_state(pipe, &state);
@@ -1237,7 +1292,34 @@ st_translate_tessctrl_program(struct st_context *st,
struct st_tessctrl_program *sttcp, struct st_tessctrl_program *sttcp,
const struct st_tcp_variant_key *key) const struct st_tcp_variant_key *key)
{ {
return NULL; /* will be updated in the next commit */ struct pipe_context *pipe = st->pipe;
struct ureg_program *ureg;
struct st_tcp_variant *tcpv;
struct pipe_shader_state state;
ureg = ureg_create_with_screen(TGSI_PROCESSOR_TESS_CTRL, pipe->screen);
if (ureg == NULL) {
return NULL;
}
ureg_property(ureg, TGSI_PROPERTY_TCS_VERTICES_OUT,
sttcp->Base.VerticesOut);
st_translate_program_common(st, &sttcp->Base.Base, sttcp->glsl_to_tgsi,
ureg, TGSI_PROCESSOR_TESS_CTRL, &state);
tcpv = CALLOC_STRUCT(st_tcp_variant);
if (!tcpv) {
ureg_free_tokens(state.tokens);
return NULL;
}
/* fill in new variant */
tcpv->driver_shader = pipe->create_tcs_state(pipe, &state);
tcpv->key = *key;
ureg_free_tokens(state.tokens);
return tcpv;
} }
@@ -1280,7 +1362,56 @@ st_translate_tesseval_program(struct st_context *st,
struct st_tesseval_program *sttep, struct st_tesseval_program *sttep,
const struct st_tep_variant_key *key) const struct st_tep_variant_key *key)
{ {
return NULL; /* will be updated in the next commit */ struct pipe_context *pipe = st->pipe;
struct ureg_program *ureg;
struct st_tep_variant *tepv;
struct pipe_shader_state state;
ureg = ureg_create_with_screen(TGSI_PROCESSOR_TESS_EVAL, pipe->screen);
if (ureg == NULL) {
return NULL;
}
if (sttep->Base.PrimitiveMode == GL_ISOLINES)
ureg_property(ureg, TGSI_PROPERTY_TES_PRIM_MODE, GL_LINES);
else
ureg_property(ureg, TGSI_PROPERTY_TES_PRIM_MODE, sttep->Base.PrimitiveMode);
switch (sttep->Base.Spacing) {
case GL_EQUAL:
ureg_property(ureg, TGSI_PROPERTY_TES_SPACING, PIPE_TESS_SPACING_EQUAL);
break;
case GL_FRACTIONAL_EVEN:
ureg_property(ureg, TGSI_PROPERTY_TES_SPACING,
PIPE_TESS_SPACING_FRACTIONAL_EVEN);
break;
case GL_FRACTIONAL_ODD:
ureg_property(ureg, TGSI_PROPERTY_TES_SPACING,
PIPE_TESS_SPACING_FRACTIONAL_ODD);
break;
default:
assert(0);
}
ureg_property(ureg, TGSI_PROPERTY_TES_VERTEX_ORDER_CW,
sttep->Base.VertexOrder == GL_CW);
ureg_property(ureg, TGSI_PROPERTY_TES_POINT_MODE, sttep->Base.PointMode);
st_translate_program_common(st, &sttep->Base.Base, sttep->glsl_to_tgsi,
ureg, TGSI_PROCESSOR_TESS_EVAL, &state);
tepv = CALLOC_STRUCT(st_tep_variant);
if (!tepv) {
ureg_free_tokens(state.tokens);
return NULL;
}
/* fill in new variant */
tepv->driver_shader = pipe->create_tes_state(pipe, &state);
tepv->key = *key;
ureg_free_tokens(state.tokens);
return tepv;
} }