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

shader: Do not adjust y coordinate if an application render to a FBO

Browse Source 
Tested-by: Jakob Bornecrantz <jakob@collabora.com>
Reviewed-by: Gurchetan Singh <gurchetansingh@chromium.org>
Signed-off-by: Elie Tournier <tournier.elie@gmail.com>
Signed-off-by: Jakob Bornecrantz <jakob@collabora.com>
macos/master
Elie Tournier 6 years ago committed by Jakob Bornecrantz
parent 7241f45c35
commit 5758881bb3
1 changed files with 9 additions and 3 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. 12
      src/vrend_shader.c

12
src/vrend_shader.c
Unescape View File

@ -78,7 +78,7 @@ struct vrend_shader_io {
bool override_no_wm; bool override_no_wm;
bool is_int; bool is_int;
bool fbfetch_used; bool fbfetch_used;
char glsl_name[64]; char glsl_name[128];
unsigned stream; unsigned stream;
}; };
@ -868,7 +868,7 @@ iter_declaration(struct tgsi_iterate_context *iter,
if (iter->processor.Processor == TGSI_PROCESSOR_FRAGMENT) { if (iter->processor.Processor == TGSI_PROCESSOR_FRAGMENT) {
if (ctx->key->coord_replace & (1 << ctx->inputs[i].sid)) { if (ctx->key->coord_replace & (1 << ctx->inputs[i].sid)) {
if (ctx->cfg->use_gles) if (ctx->cfg->use_gles)
name_prefix = "vec4(gl_PointCoord.x, 1.0 - gl_PointCoord.y, 0.0, 1.0)"; name_prefix = "vec4(gl_PointCoord.x, mix(1.0 - gl_PointCoord.y, gl_PointCoord.y, clamp(winsys_adjust_y, 0.0, 1.0)), 0.0, 1.0)";
else else
name_prefix = "vec4(gl_PointCoord, 0.0, 1.0)"; name_prefix = "vec4(gl_PointCoord, 0.0, 1.0)";
ctx->inputs[i].glsl_predefined_no_emit = true; ctx->inputs[i].glsl_predefined_no_emit = true;
@ -893,7 +893,7 @@ iter_declaration(struct tgsi_iterate_context *iter,
} }
if (ctx->inputs[i].glsl_no_index) if (ctx->inputs[i].glsl_no_index)
snprintf(ctx->inputs[i].glsl_name, 64, "%s", name_prefix); snprintf(ctx->inputs[i].glsl_name, 128, "%s", name_prefix);
else { else {
if (ctx->inputs[i].name == TGSI_SEMANTIC_FOG) if (ctx->inputs[i].name == TGSI_SEMANTIC_FOG)
snprintf(ctx->inputs[i].glsl_name, 64, "%s_f%d", name_prefix, ctx->inputs[i].sid); snprintf(ctx->inputs[i].glsl_name, 64, "%s_f%d", name_prefix, ctx->inputs[i].sid);
@ -4250,6 +4250,12 @@ static char *emit_ios(struct dump_ctx *ctx, char *glsl_hdr)
bcolor_emitted[0] = bcolor_emitted[1] = false; bcolor_emitted[0] = bcolor_emitted[1] = false;
} }
if (ctx->prog_type == TGSI_PROCESSOR_FRAGMENT) { if (ctx->prog_type == TGSI_PROCESSOR_FRAGMENT) {
if (ctx->cfg->use_gles &&
(ctx->key->coord_replace & (1 << ctx->inputs[i].sid))) {
snprintf(buf, 255, "uniform float winsys_adjust_y;\n");
STRCAT_WITH_RET(glsl_hdr, buf);
}
if (fs_emit_layout(ctx)) { if (fs_emit_layout(ctx)) {
bool upper_left = !(ctx->fs_coord_origin ^ ctx->key->invert_fs_origin); bool upper_left = !(ctx->fs_coord_origin ^ ctx->key->invert_fs_origin);
char comma = (upper_left && ctx->fs_pixel_center) ? ',' : ' '; char comma = (upper_left && ctx->fs_pixel_center) ? ',' : ' ';

Write Preview
Loading…
Cancel
Save