pandory500/SDL-mirror
2
0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fixed issues closing lines with the OpenGL ES renderer.

Browse source
This commit is contained in:
Sam Lantinga 2011-11-10 00:22:44 -05:00
parent a6adb03997
commit 97ae2354eb
3 changed files with 10 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

3
src/render/direct3d/SDL_render_d3d.c
View file

@ -889,7 +889,8 @@ D3D_RenderDrawLines(SDL_Renderer * renderer, const SDL_Point * points,
/* DirectX 9 has the same line rasterization semantics as GDI,
so we need to close the endpoint of the line */
if (points[0].x != points[count-1].x || points[0].y != points[count-1].y) {
if (count == 2 ||
points[0].x != points[count-1].x || points[0].y != points[count-1].y) {
vertices[0].x = (float) points[count-1].x;
vertices[0].y = (float) points[count-1].y;
result = IDirect3DDevice9_DrawPrimitiveUP(data->device, D3DPT_POINTLIST, 1, vertices, sizeof(*vertices));

2
src/render/opengles/SDL_render_gles.c
View file

@ -625,6 +625,8 @@ GLES_RenderDrawLines(SDL_Renderer * renderer, const SDL_Point * points,
glDrawArrays(GL_LINE_LOOP, 0, count);
} else {
glDrawArrays(GL_LINE_STRIP, 0, count);
/* We need to close the endpoint of the line */
glDrawArrays(GL_POINTS, count-1, 1);
}
SDL_stack_free(vertices);

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

@ -944,6 +944,12 @@ GLES2_RenderDrawLines(SDL_Renderer *renderer, const SDL_Point *points, int count
glGetError();
glVertexAttribPointer(GLES2_ATTRIBUTE_POSITION, 2, GL_FLOAT, GL_FALSE, 0, vertices);
glDrawArrays(GL_LINE_STRIP, 0, count);
/* We need to close the endpoint of the line */
if (count == 2 ||
points[0].x != points[count-1].x || points[0].y != points[count-1].y) {
glDrawArrays(GL_POINTS, count-1, 1);
}
SDL_stack_free(vertices);
if (glGetError() != GL_NO_ERROR)
{