We are currently migrating Bugzilla to GitHub issues.
Any changes made to the bug tracker now will be lost, so please do not post new bugs or make changes to them.
When we're done, all bug URLs will redirect to their equivalent location on the new bug tracker.

[patch] Adds viewport x/y to cliprect in UpdateClipRect + D3D

fix-bug-2269.patch (text/plain), 2.38 KB, created by Vii on 2015-01-30 13:07:38 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Vii

Created: 2015-01-30 13:07:38 UTC

Size: 2.38 KB

patch

obsolete

>diff -r 9cec3e9af221 -r a5f1d08deb49 src/render/direct3d/SDL_render_d3d.c
>--- a/src/render/direct3d/SDL_render_d3d.c
>+++ b/src/render/direct3d/SDL_render_d3d.c
>@@ -1152,10 +1152,10 @@
> 
>     if (!SDL_RectEmpty(rect)) {
>         IDirect3DDevice9_SetRenderState(data->device, D3DRS_SCISSORTESTENABLE, TRUE);
>-        r.left = rect->x;
>-        r.top = rect->y;
>-        r.right = rect->x + rect->w;
>-        r.bottom = rect->y + rect->h;
>+        r.left = renderer->viewport.x + rect->x;
>+        r.top = renderer->viewport.y + rect->y;
>+        r.right = renderer->viewport.x + rect->x + rect->w;
>+        r.bottom = renderer->viewport.y + rect->y + rect->h;
> 
>         result = IDirect3DDevice9_SetScissorRect(data->device, &r);
>         if (result != D3D_OK) {
>diff -r 9cec3e9af221 -r a5f1d08deb49 src/render/opengl/SDL_render_gl.c
>--- a/src/render/opengl/SDL_render_gl.c
>+++ b/src/render/opengl/SDL_render_gl.c
>@@ -978,7 +978,7 @@
> 
>     if (!SDL_RectEmpty(rect)) {
>         data->glEnable(GL_SCISSOR_TEST);
>-        data->glScissor(rect->x, renderer->viewport.h - rect->y - rect->h, rect->w, rect->h);
>+        data->glScissor(renderer->viewport.x + rect->x, renderer->viewport.y + renderer->viewport.h - rect->y - rect->h, rect->w, rect->h);
>     } else {
>         data->glDisable(GL_SCISSOR_TEST);
>     }
>diff -r 9cec3e9af221 -r a5f1d08deb49 src/render/opengles/SDL_render_gles.c
>--- a/src/render/opengles/SDL_render_gles.c
>+++ b/src/render/opengles/SDL_render_gles.c
>@@ -693,7 +693,7 @@
> 
>     if (!SDL_RectEmpty(rect)) {
>         data->glEnable(GL_SCISSOR_TEST);
>-        data->glScissor(rect->x, renderer->viewport.h - rect->y - rect->h, rect->w, rect->h);
>+        data->glScissor(renderer->viewport.x + rect->x, renderer->viewport.y + renderer->viewport.h - rect->y - rect->h, rect->w, rect->h);
>     } else {
>         data->glDisable(GL_SCISSOR_TEST);
>     }
>diff -r 9cec3e9af221 -r a5f1d08deb49 src/render/opengles2/SDL_render_gles2.c
>--- a/src/render/opengles2/SDL_render_gles2.c
>+++ b/src/render/opengles2/SDL_render_gles2.c
>@@ -371,7 +371,7 @@
> 
>     if (!SDL_RectEmpty(rect)) {
>         data->glEnable(GL_SCISSOR_TEST);
>-        data->glScissor(rect->x, renderer->viewport.h - rect->y - rect->h, rect->w, rect->h);
>+        data->glScissor(renderer->viewport.x + rect->x, renderer->viewport.y + renderer->viewport.h - rect->y - rect->h, rect->w, rect->h);
>     } else {
>         data->glDisable(GL_SCISSOR_TEST);
>     }

Actions: View | Diff

Attachments on bug 2269: 1473 | 1674 | 1882 | 2010

We are currently migrating Bugzilla to GitHub issues.Any changes made to the bug tracker now will be lost, so please do not post new bugs or make changes to them.When we're done, all bug URLs will redirect to their equivalent location on the new bug tracker.

We are currently migrating Bugzilla to GitHub issues.
Any changes made to the bug tracker now will be lost, so please do not post new bugs or make changes to them.
When we're done, all bug URLs will redirect to their equivalent location on the new bug tracker.