eden-emu/SDL
15
0
Fork 0
mirror of https://github.com/libsdl-org/SDL.git synced 2025-05-31 08:57:40 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

merge fallout: Patched to compile, fixed some compiler warnings, etc.

Browse source
This commit is contained in:
Ryan C. Gordon 2018-11-01 12:31:45 -04:00
parent 62494a2e27
commit 4659e73892
6 changed files with 9 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

8
src/render/opengles2/SDL_render_gles2.c
View file

@ -1297,11 +1297,11 @@ GLES2_RunCommandQueue(SDL_Renderer * renderer, SDL_RenderCommand *cmd, void *ver
if (SetDrawState(data, cmd, GLES2_IMAGESOURCE_SOLID) == 0) {
if (count > 2 && (verts[0] == verts[(count-1)*2]) && (verts[1] == verts[(count*2)-1])) {
/* GL_LINE_LOOP takes care of the final segment */
data->glDrawArrays(GL_LINE_LOOP, 0, count - 1);
data->glDrawArrays(GL_LINE_LOOP, 0, (GLsizei) (count - 1));
} else {
data->glDrawArrays(GL_LINE_STRIP, 0, count);
data->glDrawArrays(GL_LINE_STRIP, 0, (GLsizei) count);
/* We need to close the endpoint of the line */
data->glDrawArrays(GL_POINTS, count - 1, 1);
data->glDrawArrays(GL_POINTS, (GLsizei) (count - 1), 1);
}
}
break;
@ -1312,7 +1312,7 @@ GLES2_RunCommandQueue(SDL_Renderer * renderer, SDL_RenderCommand *cmd, void *ver
size_t offset = 0;
if (SetDrawState(data, cmd, GLES2_IMAGESOURCE_SOLID) == 0) {
for (i = 0; i < count; ++i, offset += 4) {
data->glDrawArrays(GL_TRIANGLE_STRIP, offset, 4);
data->glDrawArrays(GL_TRIANGLE_STRIP, (GLsizei) offset, 4);
}
}
break;