Mirrors/overte-JulianGro
3
0
Fork 0
mirror of https://github.com/JulianGro/overte.git synced 2025-04-25 17:14:59 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Resoving to master...

Browse source
This commit is contained in:
samcake 2016-04-18 17:23:57 -07:00
parent 7951284e9c
commit d25a366962
4 changed files with 6 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
libraries/gl/src/gl/Config.h
View file

@ -51,7 +51,7 @@
#if (GPU_INPUT_PROFILE == GPU_CORE_43)
// Deactivate SSBO for now, we've run into some issues
// on GL 4.3 capable GPUs not behaving as expected
#define GPU_SSBO_DRAW_CALL_INFO
//#define GPU_SSBO_DRAW_CALL_INFO
#endif

2
libraries/gpu/src/gpu/Config.slh
View file

@ -13,7 +13,7 @@
<@if GLPROFILE == PC_GL @>
<@def GPU_FEATURE_PROFILE GPU_CORE@>
<@def VERSION_HEADER #version 430 core@>
<@def VERSION_HEADER #version 410 core@>
<@elif GLPROFILE == MAC_GL @>
<@def GPU_FEATURE_PROFILE GPU_CORE@>
<@def VERSION_HEADER #version 410 core@>

3
libraries/gpu/src/gpu/GLBackend.h
View file

@ -386,8 +386,7 @@ protected:
mutable std::map<std::string, GLvoid*> _drawCallInfoOffsets;
mutable int batchNum{ 0 };
GLuint _objectBuffer[2];
GLuint _objectBuffer{ 0 };
GLuint _cameraBuffer { 0 };
GLuint _drawCallInfoBuffer { 0 };
GLuint _objectBufferTexture { 0 };

6
libraries/gpu/src/gpu/Transform.slh
View file

@ -37,7 +37,7 @@ struct TransformObject {
layout(location=15) in ivec2 _drawCallInfo;
<!<@if @>!>
<@if FALSE @>
// Disable SSBOs for now
layout(std140) buffer transformObjectBuffer {
TransformObject _object[];
@ -45,7 +45,7 @@ layout(std140) buffer transformObjectBuffer {
TransformObject getTransformObject() {
return _object[_drawCallInfo.x];
}
<! <@else@>
<@else@>
uniform samplerBuffer transformObjectBuffer;
TransformObject getTransformObject() {
@ -63,7 +63,7 @@ TransformObject getTransformObject() {
return object;
}
<@endif@> !>
<@endif@>
<@endfunc@>