mirrors/OpenRCT2
1
0
Fork 0
mirror of https://github.com/OpenRCT2/OpenRCT2 synced 2025-12-18 21:43:48 +01:00
Code Issues Releases Wiki Activity

Clean up DrawImageShader code

Browse Source
This commit is contained in:
Alexander Overvoorde
2016-07-23 02:36:43 +02:00
parent 360a92e906
commit f16ec771c3
3 changed files with 48 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

73
src/drawing/engines/opengl/DrawImageShader.cpp
View File

@@ -31,9 +31,38 @@ DrawImageShader::DrawImageShader() : OpenGLShaderProgram("drawimage")
glBufferData(GL_ARRAY_BUFFER, sizeof(vertices), vertices, GL_STATIC_DRAW); glBufferData(GL_ARRAY_BUFFER, sizeof(vertices), vertices, GL_STATIC_DRAW);
glBindVertexArray(_vao); glBindVertexArray(_vao);
glEnableVertexAttribArray(vIndex);
glVertexAttribIPointer(vIndex, 1, GL_INT, 0, nullptr); glVertexAttribIPointer(vIndex, 1, GL_INT, 0, nullptr);
glBindBuffer(GL_ARRAY_BUFFER, _vboInstances);
glVertexAttribIPointer(vClip, 4, GL_INT, sizeof(DrawImageInstance), (void*) offsetof(DrawImageInstance, clip));
glVertexAttribPointer(vTexCoordScale, 2, GL_FLOAT, GL_FALSE, sizeof(DrawImageInstance), (void*) offsetof(DrawImageInstance, texCoordScale));
glVertexAttribIPointer(vTexColourSlot, 1, GL_INT, sizeof(DrawImageInstance), (void*) offsetof(DrawImageInstance, texColourSlot));
glVertexAttribIPointer(vTexMaskSlot, 1, GL_INT, sizeof(DrawImageInstance), (void*) offsetof(DrawImageInstance, texMaskSlot));
glVertexAttribIPointer(vFlags, 1, GL_INT, sizeof(DrawImageInstance), (void*) offsetof(DrawImageInstance, flags));
glVertexAttribPointer(vColour, 4, GL_FLOAT, GL_FALSE, sizeof(DrawImageInstance), (void*) offsetof(DrawImageInstance, colour));
glVertexAttribIPointer(vBounds, 4, GL_INT, sizeof(DrawImageInstance), (void*) offsetof(DrawImageInstance, bounds));
glVertexAttribIPointer(vMask, 1, GL_INT, sizeof(DrawImageInstance), (void*) offsetof(DrawImageInstance, mask));
glEnableVertexAttribArray(vIndex);
glEnableVertexAttribArray(vClip);
glEnableVertexAttribArray(vTexCoordScale);
glEnableVertexAttribArray(vTexColourSlot);
glEnableVertexAttribArray(vTexMaskSlot);
glEnableVertexAttribArray(vFlags);
glEnableVertexAttribArray(vColour);
glEnableVertexAttribArray(vBounds);
glEnableVertexAttribArray(vMask);
glVertexAttribDivisor(vClip, 1);
glVertexAttribDivisor(vTexCoordScale, 1);
glVertexAttribDivisor(vTexColourSlot, 1);
glVertexAttribDivisor(vTexMaskSlot, 1);
glVertexAttribDivisor(vFlags, 1);
glVertexAttribDivisor(vColour, 1);
glVertexAttribDivisor(vBounds, 1);
glVertexAttribDivisor(vMask, 1);
Use(); Use();
SetTextureCoordinates(0, 0, 1, 1); SetTextureCoordinates(0, 0, 1, 1);
glUniform1i(uTexture, 0); glUniform1i(uTexture, 0);
@@ -56,6 +85,14 @@ void DrawImageShader::GetLocations()
uTextureCoordinates = GetUniformLocation("uTextureCoordinates"); uTextureCoordinates = GetUniformLocation("uTextureCoordinates");
vIndex = GetAttributeLocation("vIndex"); vIndex = GetAttributeLocation("vIndex");
vClip = GetAttributeLocation("ivClip");
vTexCoordScale = GetAttributeLocation("ivTexCoordScale");
vTexColourSlot = GetAttributeLocation("ivTexColourSlot");
vTexMaskSlot = GetAttributeLocation("ivTexMaskSlot");
vFlags = GetAttributeLocation("ivFlags");
vColour = GetAttributeLocation("ivColour");
vBounds = GetAttributeLocation("ivBounds");
vMask = GetAttributeLocation("ivMask");
} }
void DrawImageShader::SetScreenSize(sint32 width, sint32 height) void DrawImageShader::SetScreenSize(sint32 width, sint32 height)
@@ -75,41 +112,11 @@ void DrawImageShader::SetTextureCoordinates(sint32 left, sint32 top, sint32 righ
void DrawImageShader::DrawInstances(const std::vector<DrawImageInstance>& instances) void DrawImageShader::DrawInstances(const std::vector<DrawImageInstance>& instances)
{ {
// Copy instance data to vbo for single-use glBindVertexArray(_vao);
glBindBuffer(GL_ARRAY_BUFFER, _vboInstances); glBindBuffer(GL_ARRAY_BUFFER, _vboInstances);
glBufferData(GL_ARRAY_BUFFER, sizeof(instances[0]) * instances.size(), instances.data(), GL_STREAM_DRAW); glBufferData(GL_ARRAY_BUFFER, sizeof(instances[0]) * instances.size(), instances.data(), GL_STREAM_DRAW);
// Bind vertex attributes
glBindVertexArray(_vao);
glVertexAttribIPointer(GetAttributeLocation("ivClip"), 4, GL_INT, sizeof(DrawImageInstance), (void*) offsetof(DrawImageInstance, clip));
glVertexAttribPointer(GetAttributeLocation("ivTexCoordScale"), 2, GL_FLOAT, GL_FALSE, sizeof(DrawImageInstance), (void*) offsetof(DrawImageInstance, texCoordScale));
glVertexAttribIPointer(GetAttributeLocation("ivTexColourSlot"), 1, GL_INT, sizeof(DrawImageInstance), (void*) offsetof(DrawImageInstance, texColourSlot));
glVertexAttribIPointer(GetAttributeLocation("ivTexMaskSlot"), 1, GL_INT, sizeof(DrawImageInstance), (void*) offsetof(DrawImageInstance, texMaskSlot));
glVertexAttribIPointer(GetAttributeLocation("ivFlags"), 1, GL_INT, sizeof(DrawImageInstance), (void*) offsetof(DrawImageInstance, flags));
glVertexAttribPointer(GetAttributeLocation("ivColour"), 4, GL_FLOAT, GL_FALSE, sizeof(DrawImageInstance), (void*) offsetof(DrawImageInstance, colour));
glVertexAttribIPointer(GetAttributeLocation("ivBounds"), 4, GL_INT, sizeof(DrawImageInstance), (void*) offsetof(DrawImageInstance, bounds));
glVertexAttribIPointer(GetAttributeLocation("ivMask"), 1, GL_INT, sizeof(DrawImageInstance), (void*) offsetof(DrawImageInstance, mask));
glEnableVertexAttribArray(GetAttributeLocation("ivClip"));
glEnableVertexAttribArray(GetAttributeLocation("ivTexCoordScale"));
glEnableVertexAttribArray(GetAttributeLocation("ivTexColourSlot"));
glEnableVertexAttribArray(GetAttributeLocation("ivTexMaskSlot"));
glEnableVertexAttribArray(GetAttributeLocation("ivFlags"));
glEnableVertexAttribArray(GetAttributeLocation("ivColour"));
glEnableVertexAttribArray(GetAttributeLocation("ivBounds"));
glEnableVertexAttribArray(GetAttributeLocation("ivMask"));
glVertexAttribDivisor(GetAttributeLocation("ivClip"), 1);
glVertexAttribDivisor(GetAttributeLocation("ivTexCoordScale"), 1);
glVertexAttribDivisor(GetAttributeLocation("ivTexColourSlot"), 1);
glVertexAttribDivisor(GetAttributeLocation("ivTexMaskSlot"), 1);
glVertexAttribDivisor(GetAttributeLocation("ivFlags"), 1);
glVertexAttribDivisor(GetAttributeLocation("ivColour"), 1);
glVertexAttribDivisor(GetAttributeLocation("ivBounds"), 1);
glVertexAttribDivisor(GetAttributeLocation("ivMask"), 1);
// Draw instances
glDrawArraysInstanced(GL_TRIANGLES, 0, 6, instances.size()); glDrawArraysInstanced(GL_TRIANGLES, 0, 6, instances.size());
} }

8
src/drawing/engines/opengl/DrawImageShader.h
View File

@@ -42,6 +42,14 @@ private:
GLuint uTextureCoordinates; GLuint uTextureCoordinates;
GLuint vIndex; GLuint vIndex;
GLuint vClip;
GLuint vTexCoordScale;
GLuint vTexColourSlot;
GLuint vTexMaskSlot;
GLuint vFlags;
GLuint vColour;
GLuint vBounds;
GLuint vMask;
GLuint _vbo; GLuint _vbo;
GLuint _vboInstances; GLuint _vboInstances;

1
src/drawing/engines/opengl/OpenGLDrawingEngine.cpp
View File

@@ -951,7 +951,6 @@ void OpenGLDrawingContext::FlushImages() {
instance.texCoordScale = command.texColour.dimensions; instance.texCoordScale = command.texColour.dimensions;
instance.texColourSlot = command.texColour.slot; instance.texColourSlot = command.texColour.slot;
instance.texMaskSlot = command.texMask.slot; instance.texMaskSlot = command.texMask.slot;
if (!command.mask) instance.texMaskSlot = instance.texColourSlot;
instance.flags = command.flags; instance.flags = command.flags;
instance.colour = command.colour; instance.colour = command.colour;
instance.bounds = {command.bounds[0], command.bounds[1], command.bounds[2], command.bounds[3]}; instance.bounds = {command.bounds[0], command.bounds[1], command.bounds[2], command.bounds[3]};