spacecruft
/
celestia
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Remove GL1.5 VP & VP render path

pull/110/head
Hleb Valoshka 2018-10-07 19:00:27 +03:00
parent b4ab67be02
commit 8a120b1e30
4 changed files with 0 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/celengine/glcontext.cpp
View File

@ -89,7 +89,6 @@ bool GLContext::setRenderPath(GLRenderPath path)
vertexPath = VPath_Basic;
break;
case GLPath_DOT3_ARBVP:
case GLPath_ARBFP_ARBVP:
case GLPath_GLSL:
vertexPath = VPath_ARB;
break;
@ -119,14 +118,6 @@ bool GLContext::renderPathSupported(GLRenderPath path) const
GLEW_ARB_vertex_program &&
vertexProc != nullptr;
case GLPath_ARBFP_ARBVP:
return false;
/*
return GLEW_ARB_vertex_program &&
GLEW_ARB_fragment_program &&
vertexProc != nullptr;
*/
case GLPath_GLSL:
return GLEW_ARB_shader_objects &&
GLEW_ARB_shading_language_100 &&

1
src/celengine/glcontext.h
View File

@ -26,7 +26,6 @@ class GLContext
GLPath_Basic = 0,
GLPath_Multitexture = 1,
GLPath_DOT3_ARBVP = 3,
GLPath_ARBFP_ARBVP = 6,
GLPath_GLSL = 8,
};

3
src/celestia/celestiacore.cpp
View File

@ -1448,9 +1448,6 @@ void CelestiaCore::charEntered(const char *c_p, int modifiers)
case GLContext::GLPath_DOT3_ARBVP:
flash(_("Render path: OpenGL vertex program"));
break;
case GLContext::GLPath_ARBFP_ARBVP:
flash(_("Render path: OpenGL 1.5 vertex/fragment program"));
break;
case GLContext::GLPath_GLSL:
flash(_("Render path: OpenGL 2.0"));
break;

2
src/celestia/qt/qtpreferencesdialog.cpp
View File

@ -162,8 +162,6 @@ PreferencesDialog::PreferencesDialog(QWidget* parent, CelestiaCore* core) :
ui.renderPathBox->addItem(_("Multitexture"), GLContext::GLPath_Multitexture);
if (glContext->renderPathSupported(GLContext::GLPath_DOT3_ARBVP))
ui.renderPathBox->addItem(_("OpenGL vertex program"), GLContext::GLPath_DOT3_ARBVP);
if (glContext->renderPathSupported(GLContext::GLPath_ARBFP_ARBVP))
ui.renderPathBox->addItem(_("OpenGL 1.5 vertex/fragment program"), GLContext::GLPath_ARBFP_ARBVP);
if (glContext->renderPathSupported(GLContext::GLPath_GLSL))
ui.renderPathBox->addItem(_("OpenGL 2.0"), GLContext::GLPath_GLSL);