diff --git a/common/lc_context.cpp b/common/lc_context.cpp index ea5f44e4..cafeb815 100644 --- a/common/lc_context.cpp +++ b/common/lc_context.cpp @@ -42,7 +42,6 @@ lcContext::lcContext() mColorEnabled = false; mTexture2D = 0; - mTexture2DMS = 0; mTextureCubeMap = 0; mPolygonOffset = lcPolygonOffset::None; mDepthWrite = true; @@ -386,13 +385,6 @@ void lcContext::SetDefaultState() glBindTexture(GL_TEXTURE_2D, 0); mTexture2D = 0; -#ifndef LC_OPENGLES - if (gSupportsTexImage2DMultisample) - { - glBindTexture(GL_TEXTURE_2D_MULTISAMPLE, 0); - mTexture2DMS = 0; - } -#endif glBindTexture(GL_TEXTURE_CUBE_MAP, 0); mTextureCubeMap = 0; @@ -439,7 +431,6 @@ void lcContext::ClearResources() ClearVertexBuffer(); ClearIndexBuffer(); BindTexture2D(0); - BindTexture2DMS(0); } void lcContext::SetMaterial(lcMaterialType MaterialType) @@ -566,20 +557,6 @@ void lcContext::BindTexture2D(GLuint Texture) mTexture2D = Texture; } -void lcContext::BindTexture2DMS(GLuint Texture) -{ - if (mTexture2DMS == Texture) - return; - -#ifndef LC_OPENGLES - if (gSupportsTexImage2DMultisample) - { - glBindTexture(GL_TEXTURE_2D_MULTISAMPLE, Texture); - mTexture2DMS = Texture; - } -#endif -} - void lcContext::BindTextureCubeMap(GLuint Texture) { if (mTextureCubeMap == Texture) diff --git a/common/lc_context.h b/common/lc_context.h index 890a0ac1..97cb7e92 100644 --- a/common/lc_context.h +++ b/common/lc_context.h @@ -141,7 +141,6 @@ public: void SetLineWidth(float LineWidth); void SetSmoothShading(bool Smooth); void BindTexture2D(GLuint Texture); - void BindTexture2DMS(GLuint Texture); void BindTextureCubeMap(GLuint Texture); void UnbindTexture2D(GLuint Texture); void UnbindTextureCubeMap(GLuint Texture); @@ -209,7 +208,6 @@ protected: bool mColorEnabled; GLuint mTexture2D; - GLuint mTexture2DMS; GLuint mTextureCubeMap; lcPolygonOffset mPolygonOffset; bool mDepthWrite; diff --git a/common/lc_glextensions.cpp b/common/lc_glextensions.cpp index 2a1489e6..2fcb0a8a 100644 --- a/common/lc_glextensions.cpp +++ b/common/lc_glextensions.cpp @@ -5,7 +5,6 @@ bool gSupportsShaderObjects; bool gSupportsVertexBufferObject; bool gSupportsFramebufferObject; -bool gSupportsTexImage2DMultisample; bool gSupportsBlendFuncSeparate; bool gSupportsAnisotropic; GLfloat gMaxAnisotropy; @@ -59,9 +58,4 @@ void lcInitializeGLExtensions(const QOpenGLContext* Context) gSupportsFramebufferObject = Functions->hasOpenGLFeature(QOpenGLFunctions::Framebuffers); gSupportsBlendFuncSeparate = Functions->hasOpenGLFeature(QOpenGLFunctions::BlendFuncSeparate); gSupportsShaderObjects = Functions->hasOpenGLFeature(QOpenGLFunctions::Shaders); - - QOpenGLFunctions_3_2_Core* Funcs = Context->versionFunctions(); - - if (Funcs) - gSupportsTexImage2DMultisample = true; } diff --git a/common/lc_glextensions.h b/common/lc_glextensions.h index c212c822..fad7e2f6 100644 --- a/common/lc_glextensions.h +++ b/common/lc_glextensions.h @@ -5,7 +5,6 @@ void lcInitializeGLExtensions(const QOpenGLContext* Context); extern bool gSupportsShaderObjects; extern bool gSupportsVertexBufferObject; extern bool gSupportsFramebufferObject; -extern bool gSupportsTexImage2DMultisample; extern bool gSupportsBlendFuncSeparate; extern bool gSupportsAnisotropic; extern GLfloat gMaxAnisotropy; diff --git a/qt/lc_qaboutdialog.cpp b/qt/lc_qaboutdialog.cpp index bd7615cf..79d5003b 100644 --- a/qt/lc_qaboutdialog.cpp +++ b/qt/lc_qaboutdialog.cpp @@ -30,15 +30,14 @@ lcQAboutDialog::lcQAboutDialog(QWidget *parent) : const QString BuffersFormat = tr("Color Buffer: %1 bits\nDepth Buffer: %2 bits\nStencil Buffer: %3 bits\n\n"); const QString Buffers = BuffersFormat.arg(QString::number(ColorDepth), QString::number(Format.depthBufferSize()), QString::number(Format.stencilBufferSize())); - const QString ExtensionsFormat = tr("Buffers: %1\nShaders: %2\nFramebuffers: %3\nTexImage2DMultisample: %4\nBlendFuncSeparate: %5\nAnisotropic: %6\n"); + const QString ExtensionsFormat = tr("Buffers: %1\nShaders: %2\nFramebuffers: %3\nBlendFuncSeparate: %4\nAnisotropic: %5\n"); const QString VertexBuffers = gSupportsVertexBufferObject ? tr("Supported") : tr("Not supported"); const QString Shaders = gSupportsShaderObjects ? tr("Supported") : tr("Not supported"); const QString Framebuffers = gSupportsFramebufferObject ? tr("Supported") : tr("Not supported"); - const QString TexImage2DMultisample = gSupportsTexImage2DMultisample ? tr("Supported") : tr("Not supported"); const QString BlendFuncSeparate = gSupportsBlendFuncSeparate ? tr("Supported") : tr("Not supported"); const QString Anisotropic = gSupportsAnisotropic ? tr("Supported (max %1)").arg(gMaxAnisotropy) : tr("Not supported"); - const QString Extensions = ExtensionsFormat.arg(VertexBuffers, Shaders, Framebuffers, TexImage2DMultisample, BlendFuncSeparate, Anisotropic); + const QString Extensions = ExtensionsFormat.arg(VertexBuffers, Shaders, Framebuffers, BlendFuncSeparate, Anisotropic); ui->info->setText(QtVersion + Version + Buffers + Extensions); }