scratchfoundation/bgfx
1
0
Fork 0
mirror of https://github.com/scratchfoundation/bgfx.git synced 2025-02-26 16:44:00 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fixing VS2015 warnings.

Browse source
This commit is contained in:
Branimir Karadžić 2015-03-29 22:40:35 -07:00
parent 78869dc0a7
commit d62025d530
5 changed files with 68 additions and 40 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
examples/common/entry/entry.cpp
View file

@ -29,8 +29,11 @@ namespace entry
#if ENTRY_CONFIG_IMPLEMENT_DEFAULT_ALLOCATOR #if ENTRY_CONFIG_IMPLEMENT_DEFAULT_ALLOCATOR
bx::ReallocatorI* getDefaultAllocator() bx::ReallocatorI* getDefaultAllocator()
{ {
BX_PRAGMA_DIAGNOSTIC_PUSH_MSVC();
BX_PRAGMA_DIAGNOSTIC_IGNORED_MSVC(4459); // warning C4459: declaration of 's_allocator' hides global declaration
static bx::CrtAllocator s_allocator; static bx::CrtAllocator s_allocator;
return &s_allocator; return &s_allocator;
BX_PRAGMA_DIAGNOSTIC_POP_MSVC();
} }
#endif // ENTRY_CONFIG_IMPLEMENT_DEFAULT_ALLOCATOR #endif // ENTRY_CONFIG_IMPLEMENT_DEFAULT_ALLOCATOR

2
src/renderer_d3d11.cpp
View file

@ -757,7 +757,7 @@ namespace bgfx { namespace d3d11
{ {
D3D11_FEATURE_DATA_FORMAT_SUPPORT data; // D3D11_FEATURE_DATA_FORMAT_SUPPORT2 D3D11_FEATURE_DATA_FORMAT_SUPPORT data; // D3D11_FEATURE_DATA_FORMAT_SUPPORT2
data.InFormat = s_textureFormat[ii].m_fmt; data.InFormat = s_textureFormat[ii].m_fmt;
HRESULT hr = m_device->CheckFeatureSupport(D3D11_FEATURE_FORMAT_SUPPORT, &data, sizeof(data) ); hr = m_device->CheckFeatureSupport(D3D11_FEATURE_FORMAT_SUPPORT, &data, sizeof(data) );
if (SUCCEEDED(hr) ) if (SUCCEEDED(hr) )
{ {
support |= 0 != (data.OutFormatSupport & (0 support |= 0 != (data.OutFormatSupport & (0

17
src/renderer_d3d9.cpp
View file

@ -2227,10 +2227,10 @@ namespace bgfx { namespace d3d9
if (NULL != _rect) if (NULL != _rect)
{ {
RECT rect; RECT rect;
rect.left = _rect->m_x; rect.left = _rect->m_x;
rect.top = _rect->m_y; rect.top = _rect->m_y;
rect.right = rect.left + _rect->m_width; rect.right = rect.left + _rect->m_width;
rect.bottom = rect.top + _rect->m_height; rect.bottom = rect.top + _rect->m_height;
DX_CHECK(m_texture2d->LockRect(_lod, &lockedRect, &rect, 0) ); DX_CHECK(m_texture2d->LockRect(_lod, &lockedRect, &rect, 0) );
} }
else else
@ -2506,7 +2506,7 @@ namespace bgfx { namespace d3d9
if (convert) if (convert)
{ {
uint8_t* temp = (uint8_t*)BX_ALLOC(g_allocator, rectpitch*_rect.m_height); temp = (uint8_t*)BX_ALLOC(g_allocator, rectpitch*_rect.m_height);
imageDecodeToBgra8(temp, data, _rect.m_width, _rect.m_height, srcpitch, m_requestedFormat); imageDecodeToBgra8(temp, data, _rect.m_width, _rect.m_height, srcpitch, m_requestedFormat);
data = temp; data = temp;
} }
@ -2876,8 +2876,11 @@ namespace bgfx { namespace d3d9
FrameBufferHandle fbh = BGFX_INVALID_HANDLE; FrameBufferHandle fbh = BGFX_INVALID_HANDLE;
uint32_t blendFactor = 0; uint32_t blendFactor = 0;
const uint64_t pt = _render->m_debug&BGFX_DEBUG_WIREFRAME ? BGFX_STATE_PT_LINES : 0; uint8_t primIndex;
uint8_t primIndex = uint8_t(pt>>BGFX_STATE_PT_SHIFT); {
const uint64_t pt = _render->m_debug&BGFX_DEBUG_WIREFRAME ? BGFX_STATE_PT_LINES : 0;
primIndex = uint8_t(pt>>BGFX_STATE_PT_SHIFT);
}
PrimInfo prim = s_primInfo[primIndex]; PrimInfo prim = s_primInfo[primIndex];
bool viewHasScissor = false; bool viewHasScissor = false;

61
src/renderer_gl.cpp
View file

@ -2911,20 +2911,20 @@ namespace bgfx { namespace gl
m_numPredefined = 0; m_numPredefined = 0;
m_numSamplers = 0; m_numSamplers = 0;
struct VariableInfo
{
GLenum type;
GLint loc;
GLint num;
};
VariableInfo vi;
GLenum props[] = { GL_TYPE, GL_LOCATION, GL_ARRAY_SIZE };
const bool piqSupported = s_extension[Extension::ARB_program_interface_query].m_supported; const bool piqSupported = s_extension[Extension::ARB_program_interface_query].m_supported;
BX_TRACE("Uniforms (%d):", activeUniforms); BX_TRACE("Uniforms (%d):", activeUniforms);
for (int32_t ii = 0; ii < activeUniforms; ++ii) for (int32_t ii = 0; ii < activeUniforms; ++ii)
{ {
struct VariableInfo
{
GLenum type;
GLint loc;
GLint num;
};
VariableInfo vi;
GLenum props[] ={ GL_TYPE, GL_LOCATION, GL_ARRAY_SIZE };
GLenum gltype; GLenum gltype;
GLint num; GLint num;
GLint loc; GLint loc;
@ -3262,9 +3262,9 @@ namespace bgfx { namespace gl
if (decompress) if (decompress)
{ {
m_textureFormat = (uint8_t)TextureFormat::BGRA8; m_textureFormat = (uint8_t)TextureFormat::BGRA8;
const TextureFormatInfo& tfi = s_textureFormat[TextureFormat::BGRA8]; const TextureFormatInfo& tfiBgra8 = s_textureFormat[TextureFormat::BGRA8];
m_fmt = tfi.m_fmt; m_fmt = tfiBgra8.m_fmt;
m_type = tfi.m_type; m_type = tfiBgra8.m_type;
} }
setSamplerState(_flags); setSamplerState(_flags);
@ -4062,9 +4062,9 @@ namespace bgfx { namespace gl
{ {
for (uint32_t ii = 0, num = g_caps.maxFBAttachments; ii < num; ++ii) for (uint32_t ii = 0, num = g_caps.maxFBAttachments; ii < num; ++ii)
{ {
char temp[16]; char tmpFragData[16];
bx::snprintf(temp, BX_COUNTOF(temp), "gl_FragData[%d]", ii); bx::snprintf(tmpFragData, BX_COUNTOF(tmpFragData), "gl_FragData[%d]", ii);
fragData = bx::uint32_max(fragData, NULL == strstr(code, temp) ? 0 : ii+1); fragData = bx::uint32_max(fragData, NULL == strstr(code, tmpFragData) ? 0 : ii+1);
} }
BGFX_FATAL(0 != fragData, Fatal::InvalidShader, "Unable to find and patch gl_FragData!"); BGFX_FATAL(0 != fragData, Fatal::InvalidShader, "Unable to find and patch gl_FragData!");
@ -4264,7 +4264,8 @@ namespace bgfx { namespace gl
GL_CHECK(glGenFramebuffers(1, &m_fbo[1]) ); GL_CHECK(glGenFramebuffers(1, &m_fbo[1]) );
GL_CHECK(glBindFramebuffer(GL_FRAMEBUFFER, m_fbo[1]) ); GL_CHECK(glBindFramebuffer(GL_FRAMEBUFFER, m_fbo[1]) );
for (uint32_t ii = 0, colorIdx = 0; ii < _num; ++ii) colorIdx = 0;
for (uint32_t ii = 0; ii < _num; ++ii)
{ {
TextureHandle handle = _handles[ii]; TextureHandle handle = _handles[ii];
if (isValid(handle) ) if (isValid(handle) )
@ -4457,8 +4458,11 @@ namespace bgfx { namespace gl
; ;
uint32_t blendFactor = 0; uint32_t blendFactor = 0;
const uint64_t pt = _render->m_debug&BGFX_DEBUG_WIREFRAME ? BGFX_STATE_PT_LINES : 0; uint8_t primIndex;
uint8_t primIndex = uint8_t(pt>>BGFX_STATE_PT_SHIFT); {
const uint64_t pt = _render->m_debug&BGFX_DEBUG_WIREFRAME ? BGFX_STATE_PT_LINES : 0;
primIndex = uint8_t(pt>>BGFX_STATE_PT_SHIFT);
}
PrimInfo prim = s_primInfo[primIndex]; PrimInfo prim = s_primInfo[primIndex];
uint32_t baseVertex = 0; uint32_t baseVertex = 0;
@ -4853,16 +4857,15 @@ namespace bgfx { namespace gl
&& blendIndependentSupported && blendIndependentSupported
; ;
const uint32_t blend = uint32_t( (newFlags&BGFX_STATE_BLEND_MASK)>>BGFX_STATE_BLEND_SHIFT); const uint32_t blend = uint32_t( (newFlags&BGFX_STATE_BLEND_MASK)>>BGFX_STATE_BLEND_SHIFT);
const uint32_t equation = uint32_t( (newFlags&BGFX_STATE_BLEND_EQUATION_MASK)>>BGFX_STATE_BLEND_EQUATION_SHIFT); const uint32_t srcRGB = (blend )&0xf;
const uint32_t dstRGB = (blend>> 4)&0xf;
const uint32_t srcA = (blend>> 8)&0xf;
const uint32_t dstA = (blend>>12)&0xf;
const uint32_t srcRGB = (blend )&0xf; const uint32_t equ = uint32_t((newFlags&BGFX_STATE_BLEND_EQUATION_MASK)>>BGFX_STATE_BLEND_EQUATION_SHIFT);
const uint32_t dstRGB = (blend>> 4)&0xf; const uint32_t equRGB = (equ )&0x7;
const uint32_t srcA = (blend>> 8)&0xf; const uint32_t equA = (equ>>3)&0x7;
const uint32_t dstA = (blend>>12)&0xf;
const uint32_t equRGB = (equation )&0x7;
const uint32_t equA = (equation>>3)&0x7;
const uint32_t numRt = getNumRt(); const uint32_t numRt = getNumRt();
@ -5044,7 +5047,7 @@ namespace bgfx { namespace gl
currentVao = id; currentVao = id;
GL_CHECK(glBindVertexArray(id) ); GL_CHECK(glBindVertexArray(id) );
ProgramGL& program = m_program[programIdx]; program = m_program[programIdx];
program.add(hash); program.add(hash);
if (isValid(draw.m_vertexBuffer) ) if (isValid(draw.m_vertexBuffer) )
@ -5142,7 +5145,7 @@ namespace bgfx { namespace gl
baseVertex = draw.m_startVertex; baseVertex = draw.m_startVertex;
const VertexBufferGL& vb = m_vertexBuffers[draw.m_vertexBuffer.idx]; const VertexBufferGL& vb = m_vertexBuffers[draw.m_vertexBuffer.idx];
uint16_t decl = !isValid(vb.m_decl) ? draw.m_vertexDecl.idx : vb.m_decl.idx; uint16_t decl = !isValid(vb.m_decl) ? draw.m_vertexDecl.idx : vb.m_decl.idx;
const ProgramGL& program = m_program[programIdx]; program = m_program[programIdx];
program.bindAttributes(m_vertexDecls[decl], draw.m_startVertex); program.bindAttributes(m_vertexDecls[decl], draw.m_startVertex);
if (isValid(draw.m_instanceDataBuffer) ) if (isValid(draw.m_instanceDataBuffer) )

25
src/renderer_gl.h
View file

@ -623,9 +623,9 @@ namespace bgfx { namespace gl
BX_MACRO_BLOCK_BEGIN \ BX_MACRO_BLOCK_BEGIN \
/*BX_TRACE(#_call);*/ \ /*BX_TRACE(#_call);*/ \
_call; \ _call; \
GLenum err = glGetError(); \ GLenum gl_err = glGetError(); \
_check(0 == err, #_call "; GL error 0x%x: %s", err, glEnumName(err) ); \ _check(0 == gl_err, #_call "; GL error 0x%x: %s", gl_err, glEnumName(gl_err) ); \
BX_UNUSED(err); \ BX_UNUSED(gl_err); \
BX_MACRO_BLOCK_END BX_MACRO_BLOCK_END
#define IGNORE_GL_ERROR_CHECK(...) BX_NOOP() #define IGNORE_GL_ERROR_CHECK(...) BX_NOOP()
@ -704,6 +704,24 @@ namespace bgfx { namespace gl
class VaoCacheRef class VaoCacheRef
{ {
public: public:
#if BX_COMPILER_MSVC >= 1900
void add(uint32_t _hash)
{
m_vaoSet.insert(stl::make_pair(_hash, _hash) );
}
void invalidate(VaoStateCache& _vaoCache)
{
for (VaoSet::iterator it = m_vaoSet.begin(), itEnd = m_vaoSet.end(); it != itEnd; ++it)
{
_vaoCache.invalidate(it->first);
}
m_vaoSet.clear();
}
typedef stl::unordered_map<uint32_t, uint32_t> VaoSet;
#else
void add(uint32_t _hash) void add(uint32_t _hash)
{ {
m_vaoSet.insert(_hash); m_vaoSet.insert(_hash);
@ -720,6 +738,7 @@ namespace bgfx { namespace gl
} }
typedef stl::unordered_set<uint32_t> VaoSet; typedef stl::unordered_set<uint32_t> VaoSet;
#endif //
VaoSet m_vaoSet; VaoSet m_vaoSet;
}; };