ShuriZma
/
mgba
mirror of https://github.com/mgba-emu/mgba.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

GBA Video: GL OBJ mosaic

This commit is contained in:
Vicki Pfau 2019-05-20 10:26:01 -07:00
parent d84793edee
commit 6eab8d3418
2 changed files with 16 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
include/mgba/internal/gba/renderers/gl.h
View File

@ -103,6 +103,7 @@ enum {
GBA_GL_OBJ_TRANSFORM, GBA_GL_OBJ_TRANSFORM,
GBA_GL_OBJ_DIMS, GBA_GL_OBJ_DIMS,
GBA_GL_OBJ_OBJWIN, GBA_GL_OBJ_OBJWIN,
GBA_GL_OBJ_MOSAIC,
GBA_GL_FINALIZE_SCALE = 2, GBA_GL_FINALIZE_SCALE = 2,
GBA_GL_FINALIZE_LAYERS, GBA_GL_FINALIZE_LAYERS,

16
src/gba/renderers/gl.c
View File

@ -378,6 +378,7 @@ static const struct GBAVideoGLUniform _uniformsObj[] = {
{ "transform", GBA_GL_OBJ_TRANSFORM, }, { "transform", GBA_GL_OBJ_TRANSFORM, },
{ "dims", GBA_GL_OBJ_DIMS, }, { "dims", GBA_GL_OBJ_DIMS, },
{ "objwin", GBA_GL_OBJ_OBJWIN, }, { "objwin", GBA_GL_OBJ_OBJWIN, },
{ "mosaic", GBA_GL_OBJ_MOSAIC, },
{ 0 } { 0 }
}; };
@ -392,6 +393,7 @@ static const char* const _renderObj =
"uniform mat2x2 transform;\n" "uniform mat2x2 transform;\n"
"uniform ivec4 dims;\n" "uniform ivec4 dims;\n"
"uniform vec4 objwin;\n" "uniform vec4 objwin;\n"
"uniform ivec4 mosaic;\n"
"out vec4 color;\n" "out vec4 color;\n"
"out vec4 flags;\n" "out vec4 flags;\n"
"out vec3 window;\n" "out vec3 window;\n"
@ -400,7 +402,14 @@ static const char* const _renderObj =
"vec4 renderTile(int tile, int paletteId, ivec2 localCoord);\n" "vec4 renderTile(int tile, int paletteId, ivec2 localCoord);\n"
"void main() {\n" "void main() {\n"
" ivec2 coord = ivec2(transform * (texCoord - dims.zw / 2) + dims.xy / 2);\n" " vec2 incoord = texCoord;\n"
" if (mosaic.x > 1) {\n"
" incoord.x -= mod(mosaic.z + incoord.x, mosaic.x);\n"
" }\n"
" if (mosaic.y > 1) {\n"
" incoord.y -= mod(mosaic.w + incoord.y, mosaic.y);\n"
" }\n"
" ivec2 coord = ivec2(transform * (incoord - dims.zw / 2) + dims.xy / 2);\n"
" if ((coord & ~(dims.xy - 1)) != ivec2(0, 0)) {\n" " if ((coord & ~(dims.xy - 1)) != ivec2(0, 0)) {\n"
" discard;\n" " discard;\n"
" }\n" " }\n"
@ -1305,6 +1314,11 @@ void GBAVideoGLRendererDrawSprite(struct GBAVideoGLRenderer* renderer, struct GB
glUniform4f(uniforms[GBA_GL_OBJ_OBJWIN], 0, 0, 0, 0); glUniform4f(uniforms[GBA_GL_OBJ_OBJWIN], 0, 0, 0, 0);
glDrawBuffers(2, (GLenum[]) { GL_COLOR_ATTACHMENT0, GL_COLOR_ATTACHMENT1 }); glDrawBuffers(2, (GLenum[]) { GL_COLOR_ATTACHMENT0, GL_COLOR_ATTACHMENT1 });
} }
if (GBAObjAttributesAIsMosaic(sprite->a)) {
glUniform4i(uniforms[GBA_GL_OBJ_MOSAIC], GBAMosaicControlGetObjV(renderer->mosaic), GBAMosaicControlGetObjH(renderer->mosaic), x, spriteY);
} else {
glUniform4i(uniforms[GBA_GL_OBJ_MOSAIC], 0, 0, 0, 0);
}
glEnableVertexAttribArray(0); glEnableVertexAttribArray(0);
glDrawArrays(GL_TRIANGLE_FAN, 0, 4); glDrawArrays(GL_TRIANGLE_FAN, 0, 4);
glDrawBuffers(1, (GLenum[]) { GL_COLOR_ATTACHMENT0 }); glDrawBuffers(1, (GLenum[]) { GL_COLOR_ATTACHMENT0 });