History

fixing name for GLBuffer (instead of the BufferObject) and removing uneeded code

Sam Gateau committed 12 years ago

Commit a67b3771 parent 22e0e462 files · +12 −28Browse files

Showing the changes to interface/src/gpu/GLBackend.cpp (1 of 2 files). Show all

Unified · Split

interface/src/gpu/GLBackend.cpp+9−4
@@ -696,15 +696,20 @@ void GLBackend::do_glMaterialfv(Batch& batch, uint32 paramOffset) { · 695 unmodified lines
696696 CHECK_GL_ERROR();
697697 }
698698
699+GLBackend::GLBuffer::GLBuffer() :
700+ _stamp(0),
701+ _buffer(0),
702+ _size(0)
703+{}
699704
700−GLBackend::BufferObject::~BufferObject() {
705+GLBackend::GLBuffer::~GLBuffer() {
701706 if (_buffer != 0) {
702707 glDeleteBuffers(1, &_buffer);
703708 }
704709 }
705710
706711 void GLBackend::syncGPUObject(const Buffer& buffer) {
707− BufferObject* object = Backend::getGPUObject<GLBackend::BufferObject>(buffer);
712+ GLBuffer* object = Backend::getGPUObject<GLBackend::GLBuffer>(buffer);
708713
709714 if (object && (object->_stamp == buffer.getSysmem().getStamp())) {
710715 return;
@@ -712,7 +717,7 @@ void GLBackend::syncGPUObject(const Buffer& buffer) { · 1 unmodified line
712717
713718 // need to have a gpu object?
714719 if (!object) {
715− object = new BufferObject();
720+ object = new GLBuffer();
716721 glGenBuffers(1, &object->_buffer);
717722 Backend::setGPUObject(buffer, object);
718723 }
@@ -732,5 +737,5 @@ void GLBackend::syncGPUObject(const Buffer& buffer) { · 13 unmodified lines
732737
733738 GLuint GLBackend::getBufferID(const Buffer& buffer) {
734739 GLBackend::syncGPUObject(buffer);
735− return Backend::getGPUObject<GLBackend::BufferObject>(buffer)->_buffer;
740+ return Backend::getGPUObject<GLBackend::GLBuffer>(buffer)->_buffer;
736741 }