third_party
/
virglrenderer
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

shader: Fix block emission and prefer it on GLES

Browse Source 
On GLES Mesa rejects arrays of arrays as TCS and TES shader inputs and outputs.

This is based on section 4.3 of the GLSL 3.20 ES standard where an error should be
produced for "Per-vertex-arrayed arrays of arrays" and "For non-per-vertex-arrayed
array of arrays", so apparently something like

  in vec4 [][N];

is not allowed and on GLES interface blocks have to be used instead. In addition the
code needed some fixups when interface blocks are used.

v2: Emit correct type for elements in blocks

Signed-off-by: Gert Wollny <gert.wollny@collabora.com>
Reviewed-by: <Gurchetan Singh gurchetansingh@chromium.org>
macos/master
Gert Wollny 6 years ago
parent f8840c1a4b
commit 9f67d5e5d6
1 changed files with 12 additions and 11 deletions
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Show Stats Download Patch File Download Diff File
  1. 23
      src/vrend_shader.c

23
src/vrend_shader.c
Unescape View File

@ -341,7 +341,7 @@ enum io_type {
* support dereferencing block members. */
static inline bool prefer_generic_io_block(struct dump_ctx *ctx, enum io_type io)
{
if (ctx->cfg->has_arrays_of_arrays)
if (ctx->cfg->has_arrays_of_arrays && !ctx->cfg->use_gles)
return false;
switch (ctx->prog_type) {
@ -1705,7 +1705,7 @@ get_blockname(char outvar[64], const char *stage_prefix, const struct vrend_shad
static inline void
get_blockvarname(char outvar[64], const char *stage_prefix, const struct vrend_shader_io *io, const char *postfix)
{
snprintf(outvar, 64, "%sg%dA%d_%x%s", stage_prefix, io->sid, io->array_id, io->usage_mask, postfix);
snprintf(outvar, 64, "%sg%dA%d_%x%s", stage_prefix, io->first, io->array_id, io->usage_mask, postfix);
}
static void get_so_name(struct dump_ctx *ctx, bool from_block, const struct vrend_shader_io *output, int index, char out_var[255], char *wm)
@ -3837,10 +3837,11 @@ void rewrite_io_ranged(struct dump_ctx *ctx)
ctx->inputs[i].glsl_predefined_no_emit = true;
if (ctx->inputs[i].sid < ctx->patch_input_range.io.sid || ctx->patch_input_range.used == false) {
ctx->patch_input_range.io.first = i;
ctx->patch_input_range.io.usage_mask = 0xf;
ctx->patch_input_range.io.name = TGSI_SEMANTIC_PATCH;
ctx->patch_input_range.io.sid = ctx->inputs[i].sid;
ctx->patch_input_range.used = true;
if (ctx->cfg->has_arrays_of_arrays)
if (ctx->cfg->has_arrays_of_arrays && !ctx->cfg->use_gles)
ctx->shader_req_bits |= SHADER_REQ_ARRAYS_OF_ARRAYS;
}
if (ctx->inputs[i].sid > ctx->patch_input_range.io.last)
@ -3853,10 +3854,9 @@ void rewrite_io_ranged(struct dump_ctx *ctx)
ctx->generic_input_range.io.sid = ctx->inputs[i].sid;
ctx->generic_input_range.io.first = i;
ctx->generic_input_range.io.name = TGSI_SEMANTIC_GENERIC;
ctx->generic_input_range.io.usage_mask = 0xf;
ctx->generic_input_range.io.num_components = 4;
ctx->generic_input_range.used = true;
if (ctx->cfg->has_arrays_of_arrays)
if (ctx->cfg->has_arrays_of_arrays && !ctx->cfg->use_gles)
ctx->shader_req_bits |= SHADER_REQ_ARRAYS_OF_ARRAYS;
}
if (ctx->inputs[i].sid > ctx->generic_input_range.io.last)
@ -3897,7 +3897,7 @@ void rewrite_io_ranged(struct dump_ctx *ctx)
ctx->patch_output_range.io.name = TGSI_SEMANTIC_PATCH;
ctx->patch_output_range.io.sid = ctx->outputs[i].sid;
ctx->patch_output_range.used = true;
if (ctx->cfg->has_arrays_of_arrays)
if (ctx->cfg->has_arrays_of_arrays && !ctx->cfg->use_gles)
ctx->shader_req_bits |= SHADER_REQ_ARRAYS_OF_ARRAYS;
}
if (ctx->outputs[i].sid > ctx->patch_output_range.io.last) {
@ -3914,7 +3914,7 @@ void rewrite_io_ranged(struct dump_ctx *ctx)
ctx->generic_output_range.used = true;
ctx->generic_output_range.io.usage_mask = 0xf;
ctx->generic_output_range.io.num_components = 4;
if (ctx->cfg->has_arrays_of_arrays)
if (ctx->cfg->has_arrays_of_arrays && !ctx->cfg->use_gles)
ctx->shader_req_bits |= SHADER_REQ_ARRAYS_OF_ARRAYS;
}
if (ctx->outputs[i].sid > ctx->generic_output_range.io.last) {
@ -5411,10 +5411,10 @@ static void emit_ios_indirect_generics_input(struct dump_ctx *ctx, const char *p
char blockname[64];
char blockvarame[64];
const char *stage_prefix = get_stage_output_name_prefix(ctx->prog_type);
const char *stage_prefix = get_stage_input_name_prefix(ctx, ctx->prog_type);
get_blockname(blockname, stage_prefix, &ctx->generic_output_range.io);
get_blockvarname(blockvarame, stage_prefix, &ctx->generic_output_range.io,
get_blockname(blockname, stage_prefix, &ctx->generic_input_range.io);
get_blockvarname(blockvarame, stage_prefix, &ctx->generic_input_range.io,
postfix);
emit_hdrf(ctx, "in %s {\n vec4 %s[%d]; \n} %s;\n",
@ -5474,10 +5474,11 @@ emit_ios_generics(struct dump_ctx *ctx, enum io_type iot, const char *prefix,
emit_hdrf(ctx, "%s %s {\n", inout, blockname);
emit_hdr(ctx, layout);
emit_hdrf(ctx, "%s%s%s vec4 %s[%d]; \n} %s;\n",
emit_hdrf(ctx, "%s%s%s %s %s[%d]; \n} %s;\n",
prefix,
io->precise ? "precise " : "",
io->invariant ? "invariant " : "",
t,
io->glsl_name,
io->last - io->first +1,
blockvarame);

Write Preview
Loading…
Cancel
Save