Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-08-08 21:17:01 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Adding the gpu_shader4 for linux and fixing function name for mac

Browse source
This commit is contained in:
samcake 2015-07-01 14:52:23 -07:00
parent 93303a02ec
commit b23f68107c
2 changed files with 4 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -18,12 +18,13 @@
<@elif GLPROFILE == MAC_GL @> <@elif GLPROFILE == MAC_GL @>
<@def GPU_FEATURE_PROFILE GPU_LEGACY@> <@def GPU_FEATURE_PROFILE GPU_LEGACY@>
<@def GPU_TRANSFORM_PROFILE GPU_LEGACY@> <@def GPU_TRANSFORM_PROFILE GPU_LEGACY@>
<@def VERSION_HEADER #version 120 <@def VERSION_HEADER #version 120
#extension GL_EXT_gpu_shader4 : enable@> #extension GL_EXT_gpu_shader4 : enable@>
<@else@> <@else@>
<@def GPU_FEATURE_PROFILE GPU_LEGACY@> <@def GPU_FEATURE_PROFILE GPU_LEGACY@>
<@def GPU_TRANSFORM_PROFILE GPU_LEGACY@> <@def GPU_TRANSFORM_PROFILE GPU_LEGACY@>
<@def VERSION_HEADER #version 120@> <@def VERSION_HEADER #version 120
#extension GL_EXT_gpu_shader4 : enable@>
<@endif@> <@endif@>
<@endif@> <@endif@>

2
libraries/gpu/src/gpu/GLBackend.cpp
View file

@ -202,7 +202,7 @@ void GLBackend::do_drawInstanced(Batch& batch, uint32 paramOffset) {
uint32 startVertex = batch._params[paramOffset + 1]._uint; uint32 startVertex = batch._params[paramOffset + 1]._uint;
uint32 startInstance = batch._params[paramOffset + 0]._uint; uint32 startInstance = batch._params[paramOffset + 0]._uint;
glDrawArraysInstanced(mode, startVertex, numVertices, numInstances); glDrawArraysInstancedARB(mode, startVertex, numVertices, numInstances);
(void) CHECK_GL_ERROR(); (void) CHECK_GL_ERROR();
} }