Commit 7828362da9bf269c76ba0a6c128a98c639bf07b2
2021-11-24T16:45:06
SDL_Renderer software, D3D11: don't use "renderer->viewport" in back-ends, but use the one from SETVIEWPORT cmd
1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 94 95 96 97 98 99 100 101 102 103 104 105 106 107 108 109 110 111 112 113 114 115 116 117 118 119 120 121 122 123 124 125 126 127 128 129 130 131 132 133 134 135 136 137 138 139 140 141 142 143 144 145 146 147 148 149 150 151 152 153 154 155 156 157 158 159 160 161 162 163 164 165 166 167 168 169 170 171 172 173 174 175 176 177 178 179 180 181 182 183 184 185 186 187 188 189 190 191 192 193 194 195 196 197 198 199 200 201 202 203 204 205 206 207 208 209 210 211 212 213 214 215 216 217 218 219 220 221 222 223 224 225 226 227 228 229 230 231 232 233 234 235 236 237 238 239 240 241 242 243 244 245 246 247 248 249 250 251 252 253 254 255 256 257 258 259 260 261 262 263 264 265 266 267 268 269 270 271 272 273 274 275 276 277 278 279 280 281 282 283 284 285 286 287 288 289 290 291 292 293 294 295 296 297 298 299 300
diff --git a/src/render/direct3d11/SDL_render_d3d11.c b/src/render/direct3d11/SDL_render_d3d11.c
index ffae92f..c03a2d0 100644
--- a/src/render/direct3d11/SDL_render_d3d11.c
+++ b/src/render/direct3d11/SDL_render_d3d11.c
@@ -700,7 +700,10 @@ D3D11_GetRotationForCurrentRenderTarget(SDL_Renderer * renderer)
static int
D3D11_GetViewportAlignedD3DRect(SDL_Renderer * renderer, const SDL_Rect * sdlRect, D3D11_RECT * outRect, BOOL includeViewportOffset)
{
+ D3D11_RenderData *data = (D3D11_RenderData *) renderer->driverdata;
const int rotation = D3D11_GetRotationForCurrentRenderTarget(renderer);
+ const SDL_Rect *viewport = &data->currentViewport;
+
switch (rotation) {
case DXGI_MODE_ROTATION_IDENTITY:
outRect->left = sdlRect->x;
@@ -708,27 +711,27 @@ D3D11_GetViewportAlignedD3DRect(SDL_Renderer * renderer, const SDL_Rect * sdlRec
outRect->top = sdlRect->y;
outRect->bottom = sdlRect->y + sdlRect->h;
if (includeViewportOffset) {
- outRect->left += renderer->viewport.x;
- outRect->right += renderer->viewport.x;
- outRect->top += renderer->viewport.y;
- outRect->bottom += renderer->viewport.y;
+ outRect->left += viewport->x;
+ outRect->right += viewport->x;
+ outRect->top += viewport->y;
+ outRect->bottom += viewport->y;
}
break;
case DXGI_MODE_ROTATION_ROTATE270:
outRect->left = sdlRect->y;
outRect->right = sdlRect->y + sdlRect->h;
- outRect->top = renderer->viewport.w - sdlRect->x - sdlRect->w;
- outRect->bottom = renderer->viewport.w - sdlRect->x;
+ outRect->top = viewport->w - sdlRect->x - sdlRect->w;
+ outRect->bottom = viewport->w - sdlRect->x;
break;
case DXGI_MODE_ROTATION_ROTATE180:
- outRect->left = renderer->viewport.w - sdlRect->x - sdlRect->w;
- outRect->right = renderer->viewport.w - sdlRect->x;
- outRect->top = renderer->viewport.h - sdlRect->y - sdlRect->h;
- outRect->bottom = renderer->viewport.h - sdlRect->y;
+ outRect->left = viewport->w - sdlRect->x - sdlRect->w;
+ outRect->right = viewport->w - sdlRect->x;
+ outRect->top = viewport->h - sdlRect->y - sdlRect->h;
+ outRect->bottom = viewport->h - sdlRect->y;
break;
case DXGI_MODE_ROTATION_ROTATE90:
- outRect->left = renderer->viewport.h - sdlRect->y - sdlRect->h;
- outRect->right = renderer->viewport.h - sdlRect->y;
+ outRect->left = viewport->h - sdlRect->y - sdlRect->h;
+ outRect->right = viewport->h - sdlRect->y;
outRect->top = sdlRect->x;
outRect->bottom = sdlRect->x + sdlRect->h;
break;
diff --git a/src/render/software/SDL_render_sw.c b/src/render/software/SDL_render_sw.c
index e8136a2..6ce921a 100644
--- a/src/render/software/SDL_render_sw.c
+++ b/src/render/software/SDL_render_sw.c
@@ -214,18 +214,9 @@ SW_QueueDrawPoints(SDL_Renderer * renderer, SDL_RenderCommand *cmd, const SDL_FP
cmd->data.draw.count = count;
- if (renderer->viewport.x || renderer->viewport.y) {
- const int x = renderer->viewport.x;
- const int y = renderer->viewport.y;
- for (i = 0; i < count; i++, verts++, points++) {
- verts->x = (int)(x + points->x);
- verts->y = (int)(y + points->y);
- }
- } else {
- for (i = 0; i < count; i++, verts++, points++) {
- verts->x = (int)points->x;
- verts->y = (int)points->y;
- }
+ for (i = 0; i < count; i++, verts++, points++) {
+ verts->x = (int)points->x;
+ verts->y = (int)points->y;
}
return 0;
@@ -243,23 +234,11 @@ SW_QueueFillRects(SDL_Renderer * renderer, SDL_RenderCommand *cmd, const SDL_FRe
cmd->data.draw.count = count;
- if (renderer->viewport.x || renderer->viewport.y) {
- const int x = renderer->viewport.x;
- const int y = renderer->viewport.y;
-
- for (i = 0; i < count; i++, verts++, rects++) {
- verts->x = (int)(x + rects->x);
- verts->y = (int)(y + rects->y);
- verts->w = SDL_max((int)rects->w, 1);
- verts->h = SDL_max((int)rects->h, 1);
- }
- } else {
- for (i = 0; i < count; i++, verts++, rects++) {
- verts->x = (int)rects->x;
- verts->y = (int)rects->y;
- verts->w = SDL_max((int)rects->w, 1);
- verts->h = SDL_max((int)rects->h, 1);
- }
+ for (i = 0; i < count; i++, verts++, rects++) {
+ verts->x = (int)rects->x;
+ verts->y = (int)rects->y;
+ verts->w = SDL_max((int)rects->w, 1);
+ verts->h = SDL_max((int)rects->h, 1);
}
return 0;
@@ -280,13 +259,8 @@ SW_QueueCopy(SDL_Renderer * renderer, SDL_RenderCommand *cmd, SDL_Texture * text
SDL_memcpy(verts, srcrect, sizeof (SDL_Rect));
verts++;
- if (renderer->viewport.x || renderer->viewport.y) {
- verts->x = (int)(renderer->viewport.x + dstrect->x);
- verts->y = (int)(renderer->viewport.y + dstrect->y);
- } else {
- verts->x = (int)dstrect->x;
- verts->y = (int)dstrect->y;
- }
+ verts->x = (int)dstrect->x;
+ verts->y = (int)dstrect->y;
verts->w = (int)dstrect->w;
verts->h = (int)dstrect->h;
@@ -317,13 +291,8 @@ SW_QueueCopyEx(SDL_Renderer * renderer, SDL_RenderCommand *cmd, SDL_Texture * te
SDL_memcpy(&verts->srcrect, srcrect, sizeof (SDL_Rect));
- if (renderer->viewport.x || renderer->viewport.y) {
- verts->dstrect.x = (int)(renderer->viewport.x + dstrect->x);
- verts->dstrect.y = (int)(renderer->viewport.y + dstrect->y);
- } else {
- verts->dstrect.x = (int)dstrect->x;
- verts->dstrect.y = (int)dstrect->y;
- }
+ verts->dstrect.x = (int)dstrect->x;
+ verts->dstrect.y = (int)dstrect->y;
verts->dstrect.w = (int)dstrect->w;
verts->dstrect.h = (int)dstrect->h;
verts->angle = angle;
@@ -618,8 +587,8 @@ SW_QueueGeometry(SDL_Renderer *renderer, SDL_RenderCommand *cmd, SDL_Texture *te
ptr->src.x = (int)(uv_[0] * texture->w);
ptr->src.y = (int)(uv_[1] * texture->h);
- ptr->dst.x = (int)(xy_[0] * scale_x + renderer->viewport.x);
- ptr->dst.y = (int)(xy_[1] * scale_y + renderer->viewport.y);
+ ptr->dst.x = (int)(xy_[0] * scale_x);
+ ptr->dst.y = (int)(xy_[1] * scale_y);
trianglepoint_2_fixedpoint(&ptr->dst);
ptr->color = col_;
@@ -646,8 +615,8 @@ SW_QueueGeometry(SDL_Renderer *renderer, SDL_RenderCommand *cmd, SDL_Texture *te
xy_ = (float *)((char*)xy + j * xy_stride);
col_ = *(SDL_Color *)((char*)color + j * color_stride);
- ptr->dst.x = (int)(xy_[0] * scale_x + renderer->viewport.x);
- ptr->dst.y = (int)(xy_[1] * scale_y + renderer->viewport.y);
+ ptr->dst.x = (int)(xy_[0] * scale_x);
+ ptr->dst.y = (int)(xy_[1] * scale_y);
trianglepoint_2_fixedpoint(&ptr->dst);
ptr->color = col_;
@@ -755,9 +724,19 @@ SW_RunCommandQueue(SDL_Renderer * renderer, SDL_RenderCommand *cmd, void *vertic
const Uint8 b = cmd->data.draw.b;
const Uint8 a = cmd->data.draw.a;
const int count = (int) cmd->data.draw.count;
- const SDL_Point *verts = (SDL_Point *) (((Uint8 *) vertices) + cmd->data.draw.first);
+ SDL_Point *verts = (SDL_Point *) (((Uint8 *) vertices) + cmd->data.draw.first);
const SDL_BlendMode blend = cmd->data.draw.blend;
SetDrawState(surface, &drawstate);
+
+ /* Apply viewport */
+ if (drawstate.viewport->x || drawstate.viewport->y) {
+ int i;
+ for (i = 0; i < count; i++) {
+ verts[i].x += drawstate.viewport->x;
+ verts[i].y += drawstate.viewport->y;
+ }
+ }
+
if (blend == SDL_BLENDMODE_NONE) {
SDL_DrawPoints(surface, verts, count, SDL_MapRGBA(surface->format, r, g, b, a));
} else {
@@ -772,9 +751,19 @@ SW_RunCommandQueue(SDL_Renderer * renderer, SDL_RenderCommand *cmd, void *vertic
const Uint8 b = cmd->data.draw.b;
const Uint8 a = cmd->data.draw.a;
const int count = (int) cmd->data.draw.count;
- const SDL_Point *verts = (SDL_Point *) (((Uint8 *) vertices) + cmd->data.draw.first);
+ SDL_Point *verts = (SDL_Point *) (((Uint8 *) vertices) + cmd->data.draw.first);
const SDL_BlendMode blend = cmd->data.draw.blend;
SetDrawState(surface, &drawstate);
+
+ /* Apply viewport */
+ if (drawstate.viewport->x || drawstate.viewport->y) {
+ int i;
+ for (i = 0; i < count; i++) {
+ verts[i].x += drawstate.viewport->x;
+ verts[i].y += drawstate.viewport->y;
+ }
+ }
+
if (blend == SDL_BLENDMODE_NONE) {
SDL_DrawLines(surface, verts, count, SDL_MapRGBA(surface->format, r, g, b, a));
} else {
@@ -789,9 +778,19 @@ SW_RunCommandQueue(SDL_Renderer * renderer, SDL_RenderCommand *cmd, void *vertic
const Uint8 b = cmd->data.draw.b;
const Uint8 a = cmd->data.draw.a;
const int count = (int) cmd->data.draw.count;
- const SDL_Rect *verts = (SDL_Rect *) (((Uint8 *) vertices) + cmd->data.draw.first);
+ SDL_Rect *verts = (SDL_Rect *) (((Uint8 *) vertices) + cmd->data.draw.first);
const SDL_BlendMode blend = cmd->data.draw.blend;
SetDrawState(surface, &drawstate);
+
+ /* Apply viewport */
+ if (drawstate.viewport->x || drawstate.viewport->y) {
+ int i;
+ for (i = 0; i < count; i++) {
+ verts[i].x += drawstate.viewport->x;
+ verts[i].y += drawstate.viewport->y;
+ }
+ }
+
if (blend == SDL_BLENDMODE_NONE) {
SDL_FillRects(surface, verts, count, SDL_MapRGBA(surface->format, r, g, b, a));
} else {
@@ -811,6 +810,12 @@ SW_RunCommandQueue(SDL_Renderer * renderer, SDL_RenderCommand *cmd, void *vertic
PrepTextureForCopy(cmd);
+ /* Apply viewport */
+ if (drawstate.viewport->x || drawstate.viewport->y) {
+ dstrect->x += drawstate.viewport->x;
+ dstrect->y += drawstate.viewport->y;
+ }
+
if ( srcrect->w == dstrect->w && srcrect->h == dstrect->h ) {
SDL_BlitSurface(src, srcrect, surface, dstrect);
} else {
@@ -824,9 +829,16 @@ SW_RunCommandQueue(SDL_Renderer * renderer, SDL_RenderCommand *cmd, void *vertic
}
case SDL_RENDERCMD_COPY_EX: {
- const CopyExData *copydata = (CopyExData *) (((Uint8 *) vertices) + cmd->data.draw.first);
+ CopyExData *copydata = (CopyExData *) (((Uint8 *) vertices) + cmd->data.draw.first);
SetDrawState(surface, &drawstate);
PrepTextureForCopy(cmd);
+
+ /* Apply viewport */
+ if (drawstate.viewport->x || drawstate.viewport->y) {
+ copydata->dstrect.x += drawstate.viewport->x;
+ copydata->dstrect.y += drawstate.viewport->y;
+ }
+
SW_RenderCopyEx(renderer, surface, cmd->data.draw.texture, ©data->srcrect,
©data->dstrect, copydata->angle, ©data->center, copydata->flip);
break;
@@ -847,6 +859,20 @@ SW_RunCommandQueue(SDL_Renderer * renderer, SDL_RenderCommand *cmd, void *vertic
GeometryCopyData *ptr = (GeometryCopyData *) verts;
PrepTextureForCopy(cmd);
+
+ /* Apply viewport */
+ if (drawstate.viewport->x || drawstate.viewport->y) {
+ int i;
+ SDL_Point vp;
+ vp.x = drawstate.viewport->x;
+ vp.y = drawstate.viewport->y;
+ trianglepoint_2_fixedpoint(&vp);
+ for (i = 0; i < count; i++) {
+ ptr[i].dst.x += vp.x;
+ ptr[i].dst.y += vp.y;
+ }
+ }
+
for (i = 0; i < count; i += 3, ptr += 3) {
SDL_SW_BlitTriangle(
src,
@@ -857,6 +883,20 @@ SW_RunCommandQueue(SDL_Renderer * renderer, SDL_RenderCommand *cmd, void *vertic
}
} else {
GeometryFillData *ptr = (GeometryFillData *) verts;
+
+ /* Apply viewport */
+ if (drawstate.viewport->x || drawstate.viewport->y) {
+ int i;
+ SDL_Point vp;
+ vp.x = drawstate.viewport->x;
+ vp.y = drawstate.viewport->y;
+ trianglepoint_2_fixedpoint(&vp);
+ for (i = 0; i < count; i++) {
+ ptr[i].dst.x += vp.x;
+ ptr[i].dst.y += vp.y;
+ }
+ }
+
for (i = 0; i < count; i += 3, ptr += 3) {
SDL_SW_FillTriangle(surface, &(ptr[0].dst), &(ptr[1].dst), &(ptr[2].dst), blend, ptr[0].color, ptr[1].color, ptr[2].color);
}