Subversion Repository Public Repository

Divide-Framework

This repository has no backups
This repository's network speed is throttled to 100KB/sec

Diff Revisions 260 vs 264 for /trunk/Source Code/Hardware/Video/OpenGL/Textures/glSamplerOject.cpp

Diff revisions: vs.
  @@ -6,7 +6,7 @@
6 6 #include "Hardware/Video/OpenGL/Headers/GLWrapper.h"
7 7 #include "Hardware/Video/Textures/Headers/TextureDescriptor.h"
8 8
9 - glSamplerObject::glSamplerObject() : _samplerID(Divide::GL::_invalidObjectID)
9 + glSamplerObject::glSamplerObject() : _samplerID(Divide::GLUtil::_invalidObjectID)
10 10 {
11 11 bool availableSamplerObj = (glewIsSupported("GL_ARB_sampler_objects") == GL_TRUE);
12 12 if(!availableSamplerObj){
  @@ -21,7 +21,7 @@
21 21 }
22 22
23 23 bool glSamplerObject::Destroy() {
24 - if(_samplerID > 0 && _samplerID != Divide::GL::_invalidObjectID){
24 + if (_samplerID > 0 && _samplerID != Divide::GLUtil::_invalidObjectID){
25 25 glDeleteSamplers(1, &_samplerID);
26 26 _samplerID = 0;
27 27 }
  @@ -29,7 +29,7 @@
29 29 }
30 30
31 31 bool glSamplerObject::Create(const SamplerDescriptor& descriptor) {
32 - if(_samplerID == Divide::GL::_invalidObjectID) glGenSamplers(1, &_samplerID);
32 + if (_samplerID == Divide::GLUtil::_invalidObjectID) glGenSamplers(1, &_samplerID);
33 33
34 34 glSamplerParameterf(_samplerID, GL_TEXTURE_LOD_BIAS, descriptor.biasLOD());
35 35 glSamplerParameterf(_samplerID, GL_TEXTURE_MIN_LOD, descriptor.minLOD());