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

meta: Unset the textures_used_by_txf bitfield. 

Drivers that use Meta are happily using blitting data using texelFetch
and GL_SKIP_DECODE_EXT, but the GL_EXT_texture_sRGB spec unfortunately
makes GL_SKIP_DECODE_EXT not necessarily work with texelFetch.

As a hack, just unset the texture_used_by_txf bitfield so we can
continue with the old desired behavior.

Reviewed-by: Jason Ekstrand <jason@jlekstrand.net>
This commit is contained in:
Kenneth Graunke 2017-10-11 00:18:38 -07:00
parent a576c148cd
commit 32fcced7b4
1 changed files with 13 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/mesa/drivers/common/meta.c
View File

@ -87,6 +87,7 @@
#include "main/glformats.h"
#include "util/bitscan.h"
#include "util/ralloc.h"
#include "compiler/nir/nir.h"
/** Return offset in bytes of the field within a vertex struct */
#define OFFSET(FIELD) ((void *) offsetof(struct vertex, FIELD))
@ -195,6 +196,18 @@ _mesa_meta_compile_and_link_program(struct gl_context *ctx,
_mesa_meta_link_program_with_debug(ctx, sh_prog);
struct gl_program *fp =
sh_prog->_LinkedShaders[MESA_SHADER_FRAGMENT]->Program;
/* texelFetch() can break GL_SKIP_DECODE_EXT, but many meta passes want
* to use both together; pretend that we're not using texelFetch to hack
* around this bad interaction. This is a bit fragile as it may break
* if you re-run the pass that gathers this info, but we probably won't...
*/
fp->info.textures_used_by_txf = 0;
if (fp->nir)
fp->nir->info.textures_used_by_txf = 0;
_mesa_meta_use_program(ctx, sh_prog);
*out_sh_prog = sh_prog;