AlexIndustrial/mesa
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

glsl: check for xfb setting xfb info

Browse Source 
this otherwise hits the default buffer=0 path, which is invalid
for drivers which don't support xfb

fixes #9763

cc: mesa-stable

Reviewed-by: Timothy Arceri <tarceri@itsqueeze.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/25082>
This commit is contained in:
Mike Blumenkrantz
2023-09-06 10:08:35 -04:00
committed by Marge Bot
parent a0ff56e334
commit 06af083b93
2 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/compiler/glsl/glsl_parser.yy
+2 -1
View File
@@ -34,6 +34,7 @@
#include "compiler/glsl_types.h"
#include "util/u_string.h"
#include "util/format/u_format.h"
#include "main/consts_exts.h"
#ifdef _MSC_VER
#pragma warning( disable : 4065 ) // switch statement contains 'default' but no 'case' labels
@@ -2211,7 +2212,7 @@ storage_qualifier:
$$.stream = state->out_qualifier->stream;
}
if (state->has_enhanced_layouts()) {
if (state->has_enhanced_layouts() && state->exts->ARB_transform_feedback3) {
$$.flags.q.xfb_buffer = 1;
$$.flags.q.explicit_xfb_buffer = 0;
$$.xfb_buffer = state->out_qualifier->xfb_buffer;
src/compiler/glsl/glsl_parser_extras.cpp
+2 -1
View File
@@ -1200,7 +1200,8 @@ _mesa_ast_process_interface_block(YYLTYPE *locp,
block->default_layout.stream = state->out_qualifier->stream;
}
if (state->has_enhanced_layouts() && block->default_layout.flags.q.out) {
if (state->has_enhanced_layouts() && block->default_layout.flags.q.out &&
state->exts->ARB_transform_feedback3) {
/* Assign global layout's xfb_buffer value. */
block->default_layout.flags.q.xfb_buffer = 1;
block->default_layout.flags.q.explicit_xfb_buffer = 0;