LOVE/love
1
0
Fork 0
mirror of https://github.com/love2d/love.git synced 2026-08-19 20:19:42 +02:00
Code Issues Packages Projects Releases Wiki Activity

#pragma language glsl4 in shaders maps to GLES 3.2 instead of 3.1.

Browse Source
This commit is contained in:
Alex Szpakowski
2022-01-02 14:02:55 -04:00
parent 59f532fdfa
commit 91cb845f31
4 changed files with 4 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/modules/graphics/Shader.cpp
+1 -6
View File
@@ -78,11 +78,6 @@ static const char global_syntax[] = R"(
#ifdef GL_OES_standard_derivatives #ifdef GL_OES_standard_derivatives
#extension GL_OES_standard_derivatives : enable #extension GL_OES_standard_derivatives : enable
#endif #endif
#if __VERSION__ >= 300 && defined(GL_OES_texture_buffer)
#extension GL_OES_texture_buffer : enable
#elif __VERSION__ >= 300 && defined(GL_EXT_texture_buffer)
#extension GL_EXT_texture_buffer : enable
#endif
)"; )";
static const char render_uniforms[] = R"( static const char render_uniforms[] = R"(
@@ -449,7 +444,7 @@ static const Version versions[] =
{ {
{ "#version 120", "#version 100" }, { "#version 120", "#version 100" },
{ "#version 330 core", "#version 300 es" }, { "#version 330 core", "#version 300 es" },
{ "#version 430 core", "#version 310 es" }, { "#version 430 core", "#version 320 es" },
}; };
static Shader::Language getTargetLanguage(const std::string &src) static Shader::Language getTargetLanguage(const std::string &src)
src/modules/graphics/opengl/Buffer.cpp
+1 -6
View File
@@ -153,12 +153,7 @@ bool Buffer::load(const void *initialdata)
GLenum glformat = getGLFormat(getDataMember(0).decl.format); GLenum glformat = getGLFormat(getDataMember(0).decl.format);
if (GLAD_VERSION_3_1) glTexBuffer(target, glformat, buffer);
glTexBuffer(target, glformat, buffer);
else if (GLAD_OES_texture_buffer)
glTexBufferOES(target, glformat, buffer);
else if (GLAD_EXT_texture_buffer)
glTexBufferEXT(target, glformat, buffer);
} }
return (glGetError() == GL_NO_ERROR); return (glGetError() == GL_NO_ERROR);
src/modules/graphics/opengl/OpenGL.cpp
+1 -2
View File
@@ -1479,8 +1479,7 @@ bool OpenGL::isBufferUsageSupported(BufferUsage usage) const
case BUFFERUSAGE_INDEX: case BUFFERUSAGE_INDEX:
return true; return true;
case BUFFERUSAGE_TEXEL: case BUFFERUSAGE_TEXEL:
// Not supported in ES until 3.2, so we rely on extensions there... return GLAD_VERSION_3_1 || GLAD_ES_VERSION_3_2;
return GLAD_VERSION_3_1 || GLAD_OES_texture_buffer || GLAD_EXT_texture_buffer;
case BUFFERUSAGE_SHADER_STORAGE: case BUFFERUSAGE_SHADER_STORAGE:
return (GLAD_VERSION_4_3 && isCoreProfile()) || GLAD_ES_VERSION_3_1; return (GLAD_VERSION_4_3 && isCoreProfile()) || GLAD_ES_VERSION_3_1;
case BUFFERUSAGE_MAX_ENUM: case BUFFERUSAGE_MAX_ENUM:
src/modules/window/sdl/Window.cpp
+1 -1
View File
@@ -262,7 +262,7 @@ std::vector<Window::ContextAttribs> Window::getContextAttribsList() const
std::vector<ContextAttribs> glescontexts = std::vector<ContextAttribs> glescontexts =
{ {
{3, 1, true, debug}, {3, 2, true, debug},
{3, 0, true, debug}, {3, 0, true, debug},
{2, 0, true, debug} {2, 0, true, debug}
}; };