diff options
author | 2015-02-14 12:53:08 +0100 | |
---|---|---|
committer | 2015-02-14 12:53:08 +0100 | |
commit | 8afe66fc634116a654becad7d9f7f53ab199da41 (patch) | |
tree | 8c3b7889cba36cbcd2b9d6d8d6b3df87dd495cb2 /3rdparty/bgfx/src/renderer_gl.cpp | |
parent | 20b68364f7fa3bf692e50504fecf9bc5825eada3 (diff) |
Updated BGFX, BX and GENie to latest (nw)
Diffstat (limited to '3rdparty/bgfx/src/renderer_gl.cpp')
-rw-r--r-- | 3rdparty/bgfx/src/renderer_gl.cpp | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/3rdparty/bgfx/src/renderer_gl.cpp b/3rdparty/bgfx/src/renderer_gl.cpp index 7aa0d24d00b..eb25d6a7013 100644 --- a/3rdparty/bgfx/src/renderer_gl.cpp +++ b/3rdparty/bgfx/src/renderer_gl.cpp @@ -3759,7 +3759,9 @@ namespace bgfx } } - writeString(&writer, "precision mediump float;\n"); + writeStringf(&writer, "precision %s float;\n" + , m_type == GL_FRAGMENT_SHADER ? "mediump" : "highp" + ); bx::write(&writer, code, codeLen); bx::write(&writer, '\0'); @@ -4785,11 +4787,12 @@ namespace bgfx && 0 == draw.m_instanceDataOffset) { if (programChanged - || currentState.m_vertexBuffer.idx != draw.m_vertexBuffer.idx - || currentState.m_indexBuffer.idx != draw.m_indexBuffer.idx - || currentState.m_instanceDataBuffer.idx != draw.m_instanceDataBuffer.idx + || baseVertex != draw.m_startVertex + || currentState.m_vertexBuffer.idx != draw.m_vertexBuffer.idx + || currentState.m_indexBuffer.idx != draw.m_indexBuffer.idx || currentState.m_instanceDataOffset != draw.m_instanceDataOffset - || currentState.m_instanceDataStride != draw.m_instanceDataStride) + || currentState.m_instanceDataStride != draw.m_instanceDataStride + || currentState.m_instanceDataBuffer.idx != draw.m_instanceDataBuffer.idx) { bx::HashMurmur2A murmur; murmur.begin(); |