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

Fixed bug with rendering stars on OS X: was using some weird extension on

Browse source 
Apple rather than standard VBOs.
This commit is contained in:
Andrzej Kapolka 2013-05-03 15:44:51 -07:00
parent c1a3478954
commit bc0c1cf5f9
1 changed files with 9 additions and 23 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

30
interface/src/starfield/renderer/Renderer.h
View file

@ -459,11 +459,6 @@ namespace starfield {
private: // gl API handling private: // gl API handling
#ifdef __APPLE__
# define glBindVertexArray glBindVertexArrayAPPLE
# define glGenVertexArrays glGenVertexArraysAPPLE
# define glDeleteVertexArrays glDeleteVertexArraysAPPLE
#endif
void glAlloc() { void glAlloc() {
GLchar const* const VERTEX_SHADER = GLchar const* const VERTEX_SHADER =
@ -487,26 +482,21 @@ namespace starfield {
_objProgram.addShader(GL_FRAGMENT_SHADER, FRAGMENT_SHADER); _objProgram.addShader(GL_FRAGMENT_SHADER, FRAGMENT_SHADER);
_objProgram.link(); _objProgram.link();
glGenVertexArrays(1, & _hndVertexArray); glGenBuffersARB(1, & _hndVertexArray);
} }
void glFree() { void glFree() {
glDeleteVertexArrays(1, & _hndVertexArray); glDeleteBuffersARB(1, & _hndVertexArray);
} }
void glUpload(GLsizei n) { void glUpload(GLsizei n) {
glBindBufferARB(GL_ARRAY_BUFFER, _hndVertexArray);
GLuint vbo;
glGenBuffers(1, & vbo);
glBindVertexArray(_hndVertexArray);
glBindBuffer(GL_ARRAY_BUFFER, vbo);
glBufferData(GL_ARRAY_BUFFER, glBufferData(GL_ARRAY_BUFFER,
n * sizeof(GpuVertex), _arrData, GL_STATIC_DRAW); n * sizeof(GpuVertex), _arrData, GL_STATIC_DRAW);
glInterleavedArrays(GL_C4UB_V3F, sizeof(GpuVertex), 0l); //glInterleavedArrays(GL_C4UB_V3F, sizeof(GpuVertex), 0l);
glBindVertexArray(0); glBindBufferARB(GL_ARRAY_BUFFER, 0);
} }
void glBatch(GLfloat const* matrix, GLsizei n_ranges) { void glBatch(GLfloat const* matrix, GLsizei n_ranges) {
@ -538,14 +528,15 @@ namespace starfield {
// select shader and vertex array // select shader and vertex array
_objProgram.activate(); _objProgram.activate();
glBindVertexArray(_hndVertexArray); glBindBufferARB(GL_ARRAY_BUFFER, _hndVertexArray);
glInterleavedArrays(GL_C4UB_V3F, sizeof(GpuVertex), 0l);
// render // render
glMultiDrawArrays(GL_POINTS, glMultiDrawArrays(GL_POINTS,
_arrBatchOffs, _arrBatchCount, n_ranges); _arrBatchOffs, _arrBatchCount, n_ranges);
// restore state // restore state
glBindVertexArray(0); glBindBufferARB(GL_ARRAY_BUFFER, 0);
glUseProgram(0); glUseProgram(0);
glDisable(GL_VERTEX_PROGRAM_POINT_SIZE); glDisable(GL_VERTEX_PROGRAM_POINT_SIZE);
glDisable(GL_POINT_SMOOTH); glDisable(GL_POINT_SMOOTH);
@ -553,11 +544,6 @@ namespace starfield {
glMatrixMode(GL_MODELVIEW); glMatrixMode(GL_MODELVIEW);
glPopMatrix(); glPopMatrix();
} }
#ifdef __APPLE__
# undef glBindVertexArray
# undef glGenVertexArrays
# undef glDeleteVertexArrays
#endif
}; };
} // anonymous namespace } // anonymous namespace