From f4260eb405263ed201308549a237ab072849c968 Mon Sep 17 00:00:00 2001 From: bkaradzic Date: Mon, 16 Dec 2013 21:34:33 -0800 Subject: [PATCH] GL: Added num mips to sampler state cache hash value. --- include/bgfx.h | 3 ++- src/renderer_gl.cpp | 1 + 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/include/bgfx.h b/include/bgfx.h index 24fcaf08..6ae2d7d1 100644 --- a/include/bgfx.h +++ b/include/bgfx.h @@ -190,7 +190,8 @@ #define BGFX_TEXTURE_MIP_POINT UINT32_C(0x00100000) #define BGFX_TEXTURE_MIP_SHIFT 20 #define BGFX_TEXTURE_MIP_MASK UINT32_C(0x00100000) -#define BGFX_TEXTURE_RESERVED_MASK UINT32_C(0xf0000000) +#define BGFX_TEXTURE_RESERVED_SHIFT 24 +#define BGFX_TEXTURE_RESERVED_MASK UINT32_C(0xff000000) /// #define BGFX_RENDER_TARGET_NONE UINT32_C(0x00000000) diff --git a/src/renderer_gl.cpp b/src/renderer_gl.cpp index b54eee21..e6a85e8a 100644 --- a/src/renderer_gl.cpp +++ b/src/renderer_gl.cpp @@ -708,6 +708,7 @@ namespace bgfx #else if (0 == (BGFX_SAMPLER_DEFAULT_FLAGS & _flags) ) { + _flags = (_flags&(~BGFX_TEXTURE_RESERVED_MASK) ) | (_numMips<