TorqueGameEngines/Torque3D
1
0
Fork 0
mirror of https://github.com/TorqueGameEngines/Torque3D.git synced 2026-07-15 00:24:40 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

tabs->spaces for TRON :)

Browse source
This commit is contained in:
Jeff Hutchinson 2016-05-06 22:57:35 -04:00
parent f9b2aa397f
commit a50600afaa
3 changed files with 32 additions and 32 deletions
Download patch file Download diff file Expand all files Collapse all files

24
Engine/source/gfx/gl/gfxGLCardProfiler.cpp
View file

@ -65,23 +65,23 @@ void GFXGLCardProfiler::setupCardCapabilities()
// Check for anisotropic filtering support. // Check for anisotropic filtering support.
setCapability("GL_EXT_texture_filter_anisotropic", gglHasExtension(EXT_texture_filter_anisotropic)); setCapability("GL_EXT_texture_filter_anisotropic", gglHasExtension(EXT_texture_filter_anisotropic));
// Check for buffer storage // Check for buffer storage
setCapability("GL_ARB_buffer_storage", gglHasExtension(ARB_buffer_storage)); setCapability("GL_ARB_buffer_storage", gglHasExtension(ARB_buffer_storage));
// Check for shader model 5.0 // Check for shader model 5.0
setCapability("GL_ARB_gpu_shader5", gglHasExtension(ARB_gpu_shader5)); setCapability("GL_ARB_gpu_shader5", gglHasExtension(ARB_gpu_shader5));
// Check for texture storage // Check for texture storage
setCapability("GL_ARB_texture_storage", gglHasExtension(ARB_texture_storage)); setCapability("GL_ARB_texture_storage", gglHasExtension(ARB_texture_storage));
// Check for sampler objects // Check for sampler objects
setCapability("GL_ARB_sampler_objects", gglHasExtension(ARB_sampler_objects)); setCapability("GL_ARB_sampler_objects", gglHasExtension(ARB_sampler_objects));
// Check for copy image support // Check for copy image support
setCapability("GL_ARB_copy_image", gglHasExtension(ARB_copy_image)); setCapability("GL_ARB_copy_image", gglHasExtension(ARB_copy_image));
// Check for vertex attrib binding // Check for vertex attrib binding
setCapability("GL_ARB_vertex_attrib_binding", gglHasExtension(ARB_vertex_attrib_binding)); setCapability("GL_ARB_vertex_attrib_binding", gglHasExtension(ARB_vertex_attrib_binding));
} }
bool GFXGLCardProfiler::_queryCardCap(const String& query, U32& foundResult) bool GFXGLCardProfiler::_queryCardCap(const String& query, U32& foundResult)

18
Engine/source/gfx/gl/gfxGLDevice.cpp
View file

@ -140,18 +140,18 @@ void GFXGLDevice::initGLState()
glPixelStorei(GL_UNPACK_ALIGNMENT, 1); 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. // Setting mPixelShaderVersion to 3.0 will allow Advanced Lighting to run.
mPixelShaderVersion = 3.0; mPixelShaderVersion = 3.0;
// Set capability extensions. // Set capability extensions.
mCapabilities.anisotropicFiltering = mCardProfiler->queryProfile("GL_EXT_texture_filter_anisotropic"); mCapabilities.anisotropicFiltering = mCardProfiler->queryProfile("GL_EXT_texture_filter_anisotropic");
mCapabilities.bufferStorage = mCardProfiler->queryProfile("GL_ARB_buffer_storage"); mCapabilities.bufferStorage = mCardProfiler->queryProfile("GL_ARB_buffer_storage");
mCapabilities.shaderModel5 = mCardProfiler->queryProfile("GL_ARB_gpu_shader5"); mCapabilities.shaderModel5 = mCardProfiler->queryProfile("GL_ARB_gpu_shader5");
mCapabilities.textureStorage = mCardProfiler->queryProfile("GL_ARB_texture_storage"); mCapabilities.textureStorage = mCardProfiler->queryProfile("GL_ARB_texture_storage");
mCapabilities.samplerObjects = mCardProfiler->queryProfile("GL_ARB_sampler_objects"); mCapabilities.samplerObjects = mCardProfiler->queryProfile("GL_ARB_sampler_objects");
mCapabilities.copyImage = mCardProfiler->queryProfile("GL_ARB_copy_image"); mCapabilities.copyImage = mCardProfiler->queryProfile("GL_ARB_copy_image");
mCapabilities.vertexAttributeBinding = mCardProfiler->queryProfile("GL_ARB_vertex_attrib_binding"); mCapabilities.vertexAttributeBinding = mCardProfiler->queryProfile("GL_ARB_vertex_attrib_binding");
String vendorStr = (const char*)glGetString( GL_VENDOR ); String vendorStr = (const char*)glGetString( GL_VENDOR );
if( vendorStr.find("NVIDIA", 0, String::NoCase | String::Left) != String::NPos) if( vendorStr.find("NVIDIA", 0, String::NoCase | String::Left) != String::NPos)
@ -224,8 +224,8 @@ GFXGLDevice::GFXGLDevice(U32 adapterIndex) :
mCurrentVB_Divisor[i] = 0; mCurrentVB_Divisor[i] = 0;
} }
// Initiailize capabilities to false. // Initiailize capabilities to false.
memset(&mCapabilities, 0, sizeof(GLCapabilities)); memset(&mCapabilities, 0, sizeof(GLCapabilities));
loadGLCore(); loadGLCore();

22
Engine/source/gfx/gl/gfxGLDevice.h
View file

@ -45,17 +45,17 @@ class GFXGLVertexDecl;
class GFXGLDevice : public GFXDevice class GFXGLDevice : public GFXDevice
{ {
public: public:
struct GLCapabilities struct GLCapabilities
{ {
bool anisotropicFiltering; bool anisotropicFiltering;
bool bufferStorage; bool bufferStorage;
bool shaderModel5; bool shaderModel5;
bool textureStorage; bool textureStorage;
bool samplerObjects; bool samplerObjects;
bool copyImage; bool copyImage;
bool vertexAttributeBinding; bool vertexAttributeBinding;
}; };
GLCapabilities mCapabilities; GLCapabilities mCapabilities;
void zombify(); void zombify();
void resurrect(); void resurrect();