evert/osb
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix GL error

Browse Source
This commit is contained in:
Kae 2023-07-01 03:58:02 +10:00
parent ee2e134bbf
commit 1a861fb045
3 changed files with 12 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
assets/opensb/rendering/default.vert
View File

@ -11,7 +11,6 @@ attribute vec2 vertexPosition;
attribute vec2 vertexTextureCoordinate; attribute vec2 vertexTextureCoordinate;
attribute float vertexTextureIndex; attribute float vertexTextureIndex;
attribute vec4 vertexColor; attribute vec4 vertexColor;
attribute float vertexParam1;
varying vec2 fragmentTextureCoordinate; varying vec2 fragmentTextureCoordinate;
varying float fragmentTextureIndex; varying float fragmentTextureIndex;

18
source/application/StarRenderer_opengl20.cpp
View File

@ -692,10 +692,9 @@ void OpenGl20Renderer::GlRenderBuffer::set(List<RenderPrimitive>& primitives) {
glDeleteBuffers(1, &vb.vertexBuffer); glDeleteBuffers(1, &vb.vertexBuffer);
} }
void OpenGl20Renderer::logGlErrorSummary(String prefix) { bool OpenGl20Renderer::logGlErrorSummary(String prefix) {
if (GLenum error = glGetError()) { if (GLenum error = glGetError()) {
prefix += ": "; Logger::error("{}: ", prefix);
Logger::error(prefix.utf8Ptr());
do { do {
if (error == GL_INVALID_ENUM) { if (error == GL_INVALID_ENUM) {
Logger::error("GL_INVALID_ENUM"); Logger::error("GL_INVALID_ENUM");
@ -714,8 +713,10 @@ void OpenGl20Renderer::logGlErrorSummary(String prefix) {
} else { } else {
Logger::error("<UNRECOGNIZED GL ERROR>"); Logger::error("<UNRECOGNIZED GL ERROR>");
} }
} while ((error = glGetError())); } while (error = glGetError());
return true;
} }
return false;
} }
void OpenGl20Renderer::uploadTextureImage(PixelFormat pixelFormat, Vec2U size, uint8_t const* data) { void OpenGl20Renderer::uploadTextureImage(PixelFormat pixelFormat, Vec2U size, uint8_t const* data) {
@ -809,14 +810,17 @@ void OpenGl20Renderer::renderGlBuffer(GlRenderBuffer const& renderBuffer, Mat3F
glEnableVertexAttribArray(m_texCoordAttribute); glEnableVertexAttribArray(m_texCoordAttribute);
glEnableVertexAttribArray(m_texIndexAttribute); glEnableVertexAttribArray(m_texIndexAttribute);
glEnableVertexAttribArray(m_colorAttribute); glEnableVertexAttribArray(m_colorAttribute);
glEnableVertexAttribArray(m_param1Attribute);
glVertexAttribPointer(m_positionAttribute, 2, GL_FLOAT, GL_FALSE, sizeof(GlRenderVertex), (GLvoid*)offsetof(GlRenderVertex, screenCoordinate)); glVertexAttribPointer(m_positionAttribute, 2, GL_FLOAT, GL_FALSE, sizeof(GlRenderVertex), (GLvoid*)offsetof(GlRenderVertex, screenCoordinate));
glVertexAttribPointer(m_texCoordAttribute, 2, GL_FLOAT, GL_FALSE, sizeof(GlRenderVertex), (GLvoid*)offsetof(GlRenderVertex, textureCoordinate)); glVertexAttribPointer(m_texCoordAttribute, 2, GL_FLOAT, GL_FALSE, sizeof(GlRenderVertex), (GLvoid*)offsetof(GlRenderVertex, textureCoordinate));
glVertexAttribPointer(m_texIndexAttribute, 1, GL_FLOAT, GL_FALSE, sizeof(GlRenderVertex), (GLvoid*)offsetof(GlRenderVertex, textureIndex)); glVertexAttribPointer(m_texIndexAttribute, 1, GL_FLOAT, GL_FALSE, sizeof(GlRenderVertex), (GLvoid*)offsetof(GlRenderVertex, textureIndex));
glVertexAttribPointer(m_colorAttribute, 4, GL_UNSIGNED_BYTE, GL_TRUE, sizeof(GlRenderVertex), (GLvoid*)offsetof(GlRenderVertex, color)); glVertexAttribPointer(m_colorAttribute, 4, GL_UNSIGNED_BYTE, GL_TRUE, sizeof(GlRenderVertex), (GLvoid*)offsetof(GlRenderVertex, color));
glVertexAttribPointer(m_param1Attribute, 1, GL_FLOAT, GL_FALSE, sizeof(GlRenderVertex), (GLvoid*)offsetof(GlRenderVertex, param1));
if (m_param1Attribute != -1) {
glEnableVertexAttribArray(m_param1Attribute);
glVertexAttribPointer(m_param1Attribute, 1, GL_FLOAT, GL_FALSE, sizeof(GlRenderVertex), (GLvoid*)offsetof(GlRenderVertex, param1));
}
glDrawArrays(GL_TRIANGLES, 0, vb.vertexCount); glDrawArrays(GL_TRIANGLES, 0, vb.vertexCount);
} }
} }

2
source/application/StarRenderer_opengl20.hpp
View File

@ -165,7 +165,7 @@ private:
StringMap<EffectTexture> textures; StringMap<EffectTexture> textures;
}; };
static void logGlErrorSummary(String prefix); static bool logGlErrorSummary(String prefix);
static void uploadTextureImage(PixelFormat pixelFormat, Vec2U size, uint8_t const* data); static void uploadTextureImage(PixelFormat pixelFormat, Vec2U size, uint8_t const* data);
static RefPtr<GlLoneTexture> createGlTexture(Image const& texture, TextureAddressing addressing, TextureFiltering filtering); static RefPtr<GlLoneTexture> createGlTexture(Image const& texture, TextureAddressing addressing, TextureFiltering filtering);