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

st/mesa: use TGSI utility to emulate features for VS variants

Browse Source 
Reviewed-by: Dave Airlie <airlied@redhat.com>
Reviewed-by: Brian Paul <brianp@vmware.com>
Tested-by: Brian Paul <brianp@vmware.com>
This commit is contained in:
Marek Olšák
2015-10-04 00:33:11 +02:00
parent 4bbe418b4b
commit 941721ee2a
1 changed files with 29 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -43,6 +43,8 @@
#include "pipe/p_shader_tokens.h" #include "pipe/p_shader_tokens.h"
#include "draw/draw_context.h" #include "draw/draw_context.h"
#include "tgsi/tgsi_dump.h" #include "tgsi/tgsi_dump.h"
#include "tgsi/tgsi_emulate.h"
#include "tgsi/tgsi_parse.h"
#include "tgsi/tgsi_ureg.h" #include "tgsi/tgsi_ureg.h"
#include "st_debug.h" #include "st_debug.h"
@@ -377,12 +379,6 @@ st_translate_vertex_program(struct st_context *st,
vpv->key = *key; vpv->key = *key;
vpv->num_inputs = stvp->num_inputs;
if (key->passthrough_edgeflags) {
vpv->num_inputs++;
num_outputs++;
}
if (ST_DEBUG & DEBUG_MESA) { if (ST_DEBUG & DEBUG_MESA) {
_mesa_print_program(&stvp->Base.Base); _mesa_print_program(&stvp->Base.Base);
_mesa_print_program_parameters(st->ctx, &stvp->Base.Base); _mesa_print_program_parameters(st->ctx, &stvp->Base.Base);
@@ -396,7 +392,7 @@ st_translate_vertex_program(struct st_context *st,
stvp->glsl_to_tgsi, stvp->glsl_to_tgsi,
&stvp->Base.Base, &stvp->Base.Base,
/* inputs */ /* inputs */
vpv->num_inputs, stvp->num_inputs,
input_to_index, input_to_index,
NULL, /* inputSlotToAttr */ NULL, /* inputSlotToAttr */
NULL, /* input semantic name */ NULL, /* input semantic name */
@@ -409,15 +405,15 @@ st_translate_vertex_program(struct st_context *st,
output_slot_to_attr, output_slot_to_attr,
output_semantic_name, output_semantic_name,
output_semantic_index, output_semantic_index,
key->passthrough_edgeflags, false,
key->clamp_color); false);
else else
error = st_translate_mesa_program(st->ctx, error = st_translate_mesa_program(st->ctx,
TGSI_PROCESSOR_VERTEX, TGSI_PROCESSOR_VERTEX,
ureg, ureg,
&stvp->Base.Base, &stvp->Base.Base,
/* inputs */ /* inputs */
vpv->num_inputs, stvp->num_inputs,
input_to_index, input_to_index,
NULL, /* input semantic name */ NULL, /* input semantic name */
NULL, /* input semantic index */ NULL, /* input semantic index */
@@ -427,8 +423,8 @@ st_translate_vertex_program(struct st_context *st,
stvp->result_to_output, stvp->result_to_output,
output_semantic_name, output_semantic_name,
output_semantic_index, output_semantic_index,
key->passthrough_edgeflags, false,
key->clamp_color); false);
if (error) if (error)
goto fail; goto fail;
@@ -445,6 +441,27 @@ st_translate_vertex_program(struct st_context *st,
&vpv->tgsi.stream_output); &vpv->tgsi.stream_output);
} }
vpv->num_inputs = stvp->num_inputs;
/* Emulate features. */
if (key->clamp_color || key->passthrough_edgeflags) {
const struct tgsi_token *tokens;
unsigned flags =
(key->clamp_color ? TGSI_EMU_CLAMP_COLOR_OUTPUTS : 0) |
(key->passthrough_edgeflags ? TGSI_EMU_PASSTHROUGH_EDGEFLAG : 0);
tokens = tgsi_emulate(vpv->tgsi.tokens, flags);
if (tokens) {
tgsi_free_tokens(vpv->tgsi.tokens);
vpv->tgsi.tokens = tokens;
if (key->passthrough_edgeflags)
vpv->num_inputs++;
} else
fprintf(stderr, "mesa: cannot emulate deprecated features\n");
}
if (ST_DEBUG & DEBUG_TGSI) { if (ST_DEBUG & DEBUG_TGSI) {
tgsi_dump(vpv->tgsi.tokens, 0); tgsi_dump(vpv->tgsi.tokens, 0);
debug_printf("\n"); debug_printf("\n");