diff --git a/Engine/source/gfx/gl/gfxGLCardProfiler.cpp b/Engine/source/gfx/gl/gfxGLCardProfiler.cpp index 766f06bb2..760a0d5ed 100644 --- a/Engine/source/gfx/gl/gfxGLCardProfiler.cpp +++ b/Engine/source/gfx/gl/gfxGLCardProfiler.cpp @@ -65,23 +65,23 @@ void GFXGLCardProfiler::setupCardCapabilities() // Check for anisotropic filtering support. setCapability("GL_EXT_texture_filter_anisotropic", gglHasExtension(EXT_texture_filter_anisotropic)); - // Check for buffer storage - setCapability("GL_ARB_buffer_storage", gglHasExtension(ARB_buffer_storage)); + // Check for buffer storage + setCapability("GL_ARB_buffer_storage", gglHasExtension(ARB_buffer_storage)); - // Check for shader model 5.0 - setCapability("GL_ARB_gpu_shader5", gglHasExtension(ARB_gpu_shader5)); + // Check for shader model 5.0 + setCapability("GL_ARB_gpu_shader5", gglHasExtension(ARB_gpu_shader5)); - // Check for texture storage - setCapability("GL_ARB_texture_storage", gglHasExtension(ARB_texture_storage)); + // Check for texture storage + setCapability("GL_ARB_texture_storage", gglHasExtension(ARB_texture_storage)); - // Check for sampler objects - setCapability("GL_ARB_sampler_objects", gglHasExtension(ARB_sampler_objects)); + // Check for sampler objects + setCapability("GL_ARB_sampler_objects", gglHasExtension(ARB_sampler_objects)); - // Check for copy image support - setCapability("GL_ARB_copy_image", gglHasExtension(ARB_copy_image)); + // Check for copy image support + setCapability("GL_ARB_copy_image", gglHasExtension(ARB_copy_image)); - // Check for vertex attrib binding - setCapability("GL_ARB_vertex_attrib_binding", gglHasExtension(ARB_vertex_attrib_binding)); + // Check for vertex attrib binding + setCapability("GL_ARB_vertex_attrib_binding", gglHasExtension(ARB_vertex_attrib_binding)); } bool GFXGLCardProfiler::_queryCardCap(const String& query, U32& foundResult) diff --git a/Engine/source/gfx/gl/gfxGLDevice.cpp b/Engine/source/gfx/gl/gfxGLDevice.cpp index 9e5df8886..b5881dd2a 100644 --- a/Engine/source/gfx/gl/gfxGLDevice.cpp +++ b/Engine/source/gfx/gl/gfxGLDevice.cpp @@ -140,18 +140,18 @@ void GFXGLDevice::initGLState() glPixelStorei(GL_UNPACK_ALIGNMENT, 1); - // [JTH 5/6/2016] GLSL 1.50 is really SM 4.0 + // [JTH 5/6/2016] GLSL 1.50 is really SM 4.0 // Setting mPixelShaderVersion to 3.0 will allow Advanced Lighting to run. mPixelShaderVersion = 3.0; // Set capability extensions. mCapabilities.anisotropicFiltering = mCardProfiler->queryProfile("GL_EXT_texture_filter_anisotropic"); - mCapabilities.bufferStorage = mCardProfiler->queryProfile("GL_ARB_buffer_storage"); - mCapabilities.shaderModel5 = mCardProfiler->queryProfile("GL_ARB_gpu_shader5"); - mCapabilities.textureStorage = mCardProfiler->queryProfile("GL_ARB_texture_storage"); - mCapabilities.samplerObjects = mCardProfiler->queryProfile("GL_ARB_sampler_objects"); - mCapabilities.copyImage = mCardProfiler->queryProfile("GL_ARB_copy_image"); - mCapabilities.vertexAttributeBinding = mCardProfiler->queryProfile("GL_ARB_vertex_attrib_binding"); + mCapabilities.bufferStorage = mCardProfiler->queryProfile("GL_ARB_buffer_storage"); + mCapabilities.shaderModel5 = mCardProfiler->queryProfile("GL_ARB_gpu_shader5"); + mCapabilities.textureStorage = mCardProfiler->queryProfile("GL_ARB_texture_storage"); + mCapabilities.samplerObjects = mCardProfiler->queryProfile("GL_ARB_sampler_objects"); + mCapabilities.copyImage = mCardProfiler->queryProfile("GL_ARB_copy_image"); + mCapabilities.vertexAttributeBinding = mCardProfiler->queryProfile("GL_ARB_vertex_attrib_binding"); String vendorStr = (const char*)glGetString( GL_VENDOR ); if( vendorStr.find("NVIDIA", 0, String::NoCase | String::Left) != String::NPos) @@ -224,8 +224,8 @@ GFXGLDevice::GFXGLDevice(U32 adapterIndex) : mCurrentVB_Divisor[i] = 0; } - // Initiailize capabilities to false. - memset(&mCapabilities, 0, sizeof(GLCapabilities)); + // Initiailize capabilities to false. + memset(&mCapabilities, 0, sizeof(GLCapabilities)); loadGLCore(); diff --git a/Engine/source/gfx/gl/gfxGLDevice.h b/Engine/source/gfx/gl/gfxGLDevice.h index e7649c643..fc37d3220 100644 --- a/Engine/source/gfx/gl/gfxGLDevice.h +++ b/Engine/source/gfx/gl/gfxGLDevice.h @@ -45,17 +45,17 @@ class GFXGLVertexDecl; class GFXGLDevice : public GFXDevice { public: - struct GLCapabilities - { - bool anisotropicFiltering; - bool bufferStorage; - bool shaderModel5; - bool textureStorage; - bool samplerObjects; - bool copyImage; - bool vertexAttributeBinding; - }; - GLCapabilities mCapabilities; + struct GLCapabilities + { + bool anisotropicFiltering; + bool bufferStorage; + bool shaderModel5; + bool textureStorage; + bool samplerObjects; + bool copyImage; + bool vertexAttributeBinding; + }; + GLCapabilities mCapabilities; void zombify(); void resurrect();