lpnf
/
lovr
mirror of https://github.com/bjornbytes/lovr.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Post-merge fixes;

This commit is contained in:
bjorn 2018-08-10 04:21:03 -07:00
parent 9ce462a67f
commit 6d10f5c7d0
1 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/graphics/opengl.c
View File

@ -427,7 +427,7 @@ static void lovrGpuBindImage(Texture* texture, int slot) {
lovrRetain(texture);
lovrRelease(state.textures[slot]);
state.images[slot] = texture;
glBindImageTexture(slot, texture->id, 0, false, 0, GL_READ_WRITE, texture->slices[0]->format);
glBindImageTexture(slot, texture->id, 0, false, 0, GL_READ_WRITE, texture->format);
}
#endif
}
@ -1407,7 +1407,11 @@ static void lovrShaderSetupUniforms(Shader* shader) {
uniform.type = getUniformType(glType, uniform.name);
uniform.components = getUniformComponents(glType);
uniform.baseTextureSlot = uniform.type == UNIFORM_TEXTURE ? textureSlot : -1;
#ifdef EMSCRIPTEN
uniform.image = false;
#else
uniform.image = glType == GL_IMAGE_2D || glType == GL_IMAGE_3D || glType == GL_IMAGE_CUBE || glType == GL_IMAGE_2D_ARRAY;
#endif
int blockIndex;
glGetActiveUniformsiv(program, 1, &i, GL_UNIFORM_BLOCK_INDEX, &blockIndex);