Scarfski/bgfx
1
0
Fork 0
mirror of https://github.com/bkaradzic/bgfx.git synced 2026-06-08 11:23:52 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fixed texture array support for embedded shaders.

Browse Source
This commit is contained in:
Branimir Karadžić
2017-05-29 12:47:50 -07:00
parent cba4ed0f04
commit e5cf5a618d
3 changed files with 6 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
3rdparty/glsl-optimizer/src/glsl/builtin_functions.cpp vendored
View File

@@ -161,6 +161,7 @@ lod_exists_in_stage(const _mesa_glsl_parse_state *state)
*/
return state->stage == MESA_SHADER_VERTEX ||
state->is_version(130, 300) ||
state->EXT_texture_array_enable || /* BK - don't complain about texture array in fragment shaders. */
state->ARB_shader_texture_lod_enable;
}

2
3rdparty/glsl-optimizer/src/glsl/glsl_parser_extras.cpp vendored
View File

@@ -570,7 +570,7 @@ static const _mesa_glsl_extension _mesa_glsl_supported_extensions[] = {
EXT(EXT_shader_integer_mix, true, true, EXT_shader_integer_mix),
EXT(EXT_shader_texture_lod, false, true, ARB_shader_texture_lod),
EXT(EXT_shadow_samplers, false, true, EXT_shadow_samplers),
EXT(EXT_texture_array, true, false, EXT_texture_array),
EXT(EXT_texture_array, true, true, EXT_texture_array), // BK - made it available in ESSL
};
#undef EXT

4
src/bgfx_shader.sh
View File

@@ -362,6 +362,10 @@ float bgfxShadow2DProj(sampler2DShadow _sampler, vec4 _coord)
# define texture2D(_sampler, _coord) tex2D(_sampler, _coord)
# define texture2DProj(_sampler, _coord) bgfxTexture2DProj(_sampler, _coord)
# define SAMPLER2DARRAY(_name, _reg) SAMPLER2D(_name, _reg)
# define texture2DArray(_sampler, _coord) texture2D(_sampler, (_coord).xy)
# define texture2DArrayLod(_sampler, _coord, _lod) texture2DLod(_sampler, _coord, _lod)
# define SAMPLER2DSHADOW(_name, _reg) uniform sampler2DShadow _name : REGISTER(s, _reg)
# define shadow2D(_sampler, _coord) bgfxShadow2D(_sampler, _coord)
# define shadow2DProj(_sampler, _coord) bgfxShadow2DProj(_sampler, _coord)