ilikecats/stk-code_catmod
1
1
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Remove a no-op test

Browse Source 
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@12828 178a84e3-b1eb-0310-8ba1-8eac791a3b58
This commit is contained in:
curaga
2013-05-31 14:15:50 +00:00
parent a6a2ec66d4
commit ed9b4db88d
3 changed files with 5 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/graphics/irr_driver.cpp
View File

@@ -1744,7 +1744,6 @@ bool IrrDriver::supportsSplatting()
{
return UserConfigParams::m_pixel_shaders &&
m_video_driver->queryFeature(EVDF_ARB_GLSL) &&
m_video_driver->queryFeature(EVDF_PIXEL_SHADER_2_0) &&
m_video_driver->queryFeature(EVDF_MULTITEXTURE );
}

15
src/graphics/material.cpp
View File

@@ -1014,8 +1014,7 @@ void Material::setMaterialProperties(video::SMaterial *m, scene::IMeshBuffer* m
{
IVideoDriver* video_driver = irr_driver->getVideoDriver();
if (UserConfigParams::m_pixel_shaders &&
video_driver->queryFeature(video::EVDF_ARB_GLSL) &&
video_driver->queryFeature(video::EVDF_PIXEL_SHADER_2_0))
video_driver->queryFeature(video::EVDF_ARB_GLSL))
{
if (m_shaders[SHADER_SPHERE_MAP] == NULL)
{
@@ -1094,8 +1093,7 @@ void Material::setMaterialProperties(video::SMaterial *m, scene::IMeshBuffer* m
{
IVideoDriver* video_driver = irr_driver->getVideoDriver();
if (UserConfigParams::m_pixel_shaders &&
video_driver->queryFeature(video::EVDF_ARB_GLSL) &&
video_driver->queryFeature(video::EVDF_PIXEL_SHADER_2_0))
video_driver->queryFeature(video::EVDF_ARB_GLSL))
{
ITexture* tex = irr_driver->getTexture(m_normal_map_tex);
if (m_is_heightmap)
@@ -1269,8 +1267,7 @@ void Material::setMaterialProperties(video::SMaterial *m, scene::IMeshBuffer* m
{
IVideoDriver* video_driver = irr_driver->getVideoDriver();
if (UserConfigParams::m_pixel_shaders &&
video_driver->queryFeature(video::EVDF_ARB_GLSL) &&
video_driver->queryFeature(video::EVDF_PIXEL_SHADER_2_0))
video_driver->queryFeature(video::EVDF_ARB_GLSL))
{
if (m_bubble_provider.find(mb) == m_bubble_provider.end())
{
@@ -1303,8 +1300,7 @@ void Material::setMaterialProperties(video::SMaterial *m, scene::IMeshBuffer* m
{
IVideoDriver* video_driver = irr_driver->getVideoDriver();
if (UserConfigParams::m_pixel_shaders &&
video_driver->queryFeature(video::EVDF_ARB_GLSL) &&
video_driver->queryFeature(video::EVDF_PIXEL_SHADER_2_0))
video_driver->queryFeature(video::EVDF_ARB_GLSL))
{
if (m_shaders[SHADER_WATER] == NULL)
{
@@ -1341,8 +1337,7 @@ void Material::setMaterialProperties(video::SMaterial *m, scene::IMeshBuffer* m
{
IVideoDriver* video_driver = irr_driver->getVideoDriver();
if (UserConfigParams::m_pixel_shaders &&
video_driver->queryFeature(video::EVDF_ARB_GLSL) &&
video_driver->queryFeature(video::EVDF_PIXEL_SHADER_2_0))
video_driver->queryFeature(video::EVDF_ARB_GLSL))
{
if (m_shaders[SHADER_GRASS] == NULL)
{

1
src/graphics/post_processing.cpp
View File

@@ -38,7 +38,6 @@ PostProcessing::PostProcessing(video::IVideoDriver* video_driver)
// Check if post-processing is supported on this hardware
m_supported = false;
if( video_driver->queryFeature(video::EVDF_ARB_GLSL) &&
video_driver->queryFeature(video::EVDF_PIXEL_SHADER_2_0) &&
video_driver->queryFeature(video::EVDF_RENDER_TO_TARGET))
{
m_supported = true;