From f580110d7fe06a5f4d8bf792fe207a4e615fcd5b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Branimir=20Karad=C5=BEi=C4=87?= Date: Wed, 30 Jul 2014 20:34:26 -0700 Subject: [PATCH] Cleanup. --- src/bgfx_p.h | 12 +----------- src/renderer_d3d11.cpp | 3 --- src/renderer_d3d9.cpp | 3 --- src/renderer_gl.cpp | 3 --- 4 files changed, 1 insertion(+), 20 deletions(-) diff --git a/src/bgfx_p.h b/src/bgfx_p.h index 7f7b3456..85c87260 100644 --- a/src/bgfx_p.h +++ b/src/bgfx_p.h @@ -127,16 +127,7 @@ namespace stl #define BGFX_DEFAULT_WIDTH 1280 #define BGFX_DEFAULT_HEIGHT 720 -#define BGFX_STATE_TEX0 UINT64_C(0x0100000000000000) -#define BGFX_STATE_TEX1 UINT64_C(0x0200000000000000) -#define BGFX_STATE_TEX2 UINT64_C(0x0400000000000000) -#define BGFX_STATE_TEX3 UINT64_C(0x0800000000000000) -#define BGFX_STATE_TEX4 UINT64_C(0x1000000000000000) -#define BGFX_STATE_TEX5 UINT64_C(0x2000000000000000) -#define BGFX_STATE_TEX6 UINT64_C(0x4000000000000000) -#define BGFX_STATE_TEX7 UINT64_C(0x8000000000000000) -#define BGFX_STATE_TEX_MASK UINT64_C(0xff00000000000000) -#define BGFX_STATE_TEX_COUNT 8 +#define BGFX_STATE_TEX_COUNT 16 #define BGFX_MAX_COMPUTE_BINDINGS 8 @@ -1274,7 +1265,6 @@ namespace bgfx void setTexture(uint8_t _stage, UniformHandle _sampler, TextureHandle _handle, uint32_t _flags) { - m_flags |= BGFX_STATE_TEX0<<_stage; Sampler& sampler = m_draw.m_sampler[_stage]; sampler.m_idx = _handle.idx; sampler.m_flags = (_flags&BGFX_SAMPLER_DEFAULT_FLAGS) ? BGFX_SAMPLER_DEFAULT_FLAGS : _flags; diff --git a/src/renderer_d3d11.cpp b/src/renderer_d3d11.cpp index 5c4d25ea..13f84747 100644 --- a/src/renderer_d3d11.cpp +++ b/src/renderer_d3d11.cpp @@ -2980,10 +2980,8 @@ namespace bgfx } } -// if (BGFX_STATE_TEX_MASK & changedFlags) { uint32_t changes = 0; - uint64_t flag = BGFX_STATE_TEX0; for (uint32_t stage = 0; stage < BGFX_STATE_TEX_COUNT; ++stage) { const Sampler& sampler = draw.m_sampler[stage]; @@ -3007,7 +3005,6 @@ namespace bgfx } current = sampler; - flag <<= 1; } if (0 < changes) diff --git a/src/renderer_d3d9.cpp b/src/renderer_d3d9.cpp index 9ad2831c..8fdeb0f9 100644 --- a/src/renderer_d3d9.cpp +++ b/src/renderer_d3d9.cpp @@ -2974,9 +2974,7 @@ namespace bgfx } } -// if (BGFX_STATE_TEX_MASK & changedFlags) { - uint64_t flag = BGFX_STATE_TEX0; for (uint32_t stage = 0; stage < BGFX_STATE_TEX_COUNT; ++stage) { const Sampler& sampler = draw.m_sampler[stage]; @@ -2996,7 +2994,6 @@ namespace bgfx } current = sampler; - flag <<= 1; } } diff --git a/src/renderer_gl.cpp b/src/renderer_gl.cpp index 235cc306..48351520 100644 --- a/src/renderer_gl.cpp +++ b/src/renderer_gl.cpp @@ -4423,9 +4423,7 @@ namespace bgfx } } -// if (BGFX_STATE_TEX_MASK & changedFlags) { - uint64_t flag = BGFX_STATE_TEX0; for (uint32_t stage = 0; stage < BGFX_STATE_TEX_COUNT; ++stage) { const Sampler& sampler = draw.m_sampler[stage]; @@ -4442,7 +4440,6 @@ namespace bgfx } current = sampler; - flag <<= 1; } }