ryujinx/SDL
1
0
Fork 0
mirror of https://github.com/Ryujinx/SDL.git synced 2025-05-09 21:32:18 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix declaration-after-statement and remove tabs

Browse source
This commit is contained in:
Sylvain 2021-04-01 11:47:45 +02:00 committed by Sylvain Becker
parent cd4663dfcb
commit cd0663e053
5 changed files with 44 additions and 37 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
src/render/SDL_render.c
View file

@ -3356,7 +3356,7 @@ remap_one_indice(
SDL_Texture *texture, SDL_Texture *texture,
const float *xy, int xy_stride, const float *xy, int xy_stride,
const int *color, int color_stride, const int *color, int color_stride,
const float *uv, int uv_stride) const float *uv, int uv_stride)
{ {
const float *xy0_, *xy1_, *uv0_, *uv1_; const float *xy0_, *xy1_, *uv0_, *uv1_;
int col0_, col1_; int col0_, col1_;
@ -3429,7 +3429,7 @@ SDL_SW_RenderGeometryRaw(SDL_Renderer *renderer,
int texw = 0, texh = 0; int texw = 0, texh = 0;
if (texture) { if (texture) {
SDL_QueryTexture(texture, NULL, NULL, &texw, &texh); SDL_QueryTexture(texture, NULL, NULL, &texw, &texh);
} }
prev[0] = -1; prev[1] = -1; prev[2] = -1; prev[0] = -1; prev[1] = -1; prev[2] = -1;
@ -3468,7 +3468,7 @@ SDL_SW_RenderGeometryRaw(SDL_Renderer *renderer,
prev[0] = k0; prev[0] = k0;
prev[1] = k1; prev[1] = k1;
prev[2] = k2; prev[2] = k2;
continue; continue;
} }
/* Two triangles forming a quadialateral, /* Two triangles forming a quadialateral,
@ -3551,7 +3551,7 @@ SDL_SW_RenderGeometryRaw(SDL_Renderer *renderer,
x1 = xy1_[0]; y1 = xy1_[1]; x1 = xy1_[0]; y1 = xy1_[1];
x2 = xy2_[0]; y2 = xy2_[1]; x2 = xy2_[0]; y2 = xy2_[1];
/* Check if triangle A B C is rectangle */ /* Check if triangle A B C is rectangle */
if ((x0 == x2 && y1 == y2) || (y0 == y2 && x1 == x2)){ if ((x0 == x2 && y1 == y2) || (y0 == y2 && x1 == x2)){
/* ok */ /* ok */
} else { } else {
@ -3562,7 +3562,7 @@ SDL_SW_RenderGeometryRaw(SDL_Renderer *renderer,
xy2_ = (const float *)((const char*)xy + C2 * xy_stride); xy2_ = (const float *)((const char*)xy + C2 * xy_stride);
x2 = xy2_[0]; y2 = xy2_[1]; x2 = xy2_[0]; y2 = xy2_[1];
/* Check if triangle A B C2 is rectangle */ /* Check if triangle A B C2 is rectangle */
if ((x0 == x2 && y1 == y2) || (y0 == y2 && x1 == x2)){ if ((x0 == x2 && y1 == y2) || (y0 == y2 && x1 == x2)){
/* ok */ /* ok */
} else { } else {
@ -3616,7 +3616,7 @@ SDL_SW_RenderGeometryRaw(SDL_Renderer *renderer,
SDL_RenderCopyF(renderer, texture, &s, &d); SDL_RenderCopyF(renderer, texture, &s, &d);
if (debug) { if (debug) {
SDL_Log("Rect-COPY: RGB %d %d %d - Alpha:%d - texture=%p: src=(%d,%d, %d x %d) dst (%f, %f, %f x %f)", col0_.r, col0_.g, col0_.b, col0_.a, SDL_Log("Rect-COPY: RGB %d %d %d - Alpha:%d - texture=%p: src=(%d,%d, %d x %d) dst (%f, %f, %f x %f)", col0_.r, col0_.g, col0_.b, col0_.a,
(void *)texture, s.x, s.y, s.w, s.h, d.x, d.y, d.w, d.h); (void *)texture, s.x, s.y, s.w, s.h, d.x, d.y, d.w, d.h);
} }
} else if (d.w != 0.0f && d.h != 0.0f) { /* Rect, no texture */ } else if (d.w != 0.0f && d.h != 0.0f) { /* Rect, no texture */
@ -3625,12 +3625,12 @@ SDL_SW_RenderGeometryRaw(SDL_Renderer *renderer,
SDL_RenderFillRectF(renderer, &d); SDL_RenderFillRectF(renderer, &d);
if (debug) { if (debug) {
SDL_Log("Rect-FILL: RGB %d %d %d - Alpha:%d - texture=%p: src=(%d,%d, %d x %d) dst (%f, %f, %f x %f)", col0_.r, col0_.g, col0_.b, col0_.a, SDL_Log("Rect-FILL: RGB %d %d %d - Alpha:%d - texture=%p: src=(%d,%d, %d x %d) dst (%f, %f, %f x %f)", col0_.r, col0_.g, col0_.b, col0_.a,
(void *)texture, s.x, s.y, s.w, s.h, d.x, d.y, d.w, d.h); (void *)texture, s.x, s.y, s.w, s.h, d.x, d.y, d.w, d.h);
} }
} else { } else {
if (debug) { if (debug) {
SDL_Log("Rect-DISMISS: RGB %d %d %d - Alpha:%d - texture=%p: src=(%d,%d, %d x %d) dst (%f, %f, %f x %f)", col0_.r, col0_.g, col0_.b, col0_.a, SDL_Log("Rect-DISMISS: RGB %d %d %d - Alpha:%d - texture=%p: src=(%d,%d, %d x %d) dst (%f, %f, %f x %f)", col0_.r, col0_.g, col0_.b, col0_.a,
(void *)texture, s.x, s.y, s.w, s.h, d.x, d.y, d.w, d.h); (void *)texture, s.x, s.y, s.w, s.h, d.x, d.y, d.w, d.h);
} }
} }

37
src/render/direct3d11/SDL_render_d3d11.c
View file

@ -1867,9 +1867,9 @@ D3D11_QueueCopyEx(SDL_Renderer * renderer, SDL_RenderCommand *cmd, SDL_Texture *
static int static int
D3D11_QueueGeometry(SDL_Renderer *renderer, SDL_RenderCommand *cmd, SDL_Texture *texture, D3D11_QueueGeometry(SDL_Renderer *renderer, SDL_RenderCommand *cmd, SDL_Texture *texture,
const float *xy, int xy_stride, const int *color, int color_stride, const float *uv, int uv_stride, const float *xy, int xy_stride, const int *color, int color_stride, const float *uv, int uv_stride,
int num_vertices, const void *indices, int num_indices, int size_indice, int num_vertices, const void *indices, int num_indices, int size_indice,
float scale_x, float scale_y) float scale_x, float scale_y)
{ {
int i; int i;
int count = indices ? num_indices : num_vertices; int count = indices ? num_indices : num_vertices;
@ -1882,22 +1882,21 @@ D3D11_QueueGeometry(SDL_Renderer *renderer, SDL_RenderCommand *cmd, SDL_Texture
cmd->data.draw.count = count; cmd->data.draw.count = count;
for (i = 0; i < count; i++) { for (i = 0; i < count; i++) {
int j; int j;
if (size_indice == 4) { float *xy_;
j = ((const Uint32 *)indices)[i]; SDL_Color col_;
} if (size_indice == 4) {
else if (size_indice == 2) { j = ((const Uint32 *)indices)[i];
j = ((const Uint16 *)indices)[i]; } else if (size_indice == 2) {
} j = ((const Uint16 *)indices)[i];
else if (size_indice == 1) { } else if (size_indice == 1) {
j = ((const Uint8 *)indices)[i]; j = ((const Uint8 *)indices)[i];
} } else {
else { j = i;
j = i; }
}
float *xy_ = (float *)((char*)xy + j * xy_stride); xy_ = (float *)((char*)xy + j * xy_stride);
SDL_Color col_ = *(SDL_Color *)((char*)color + j * color_stride); col_ = *(SDL_Color *)((char*)color + j * color_stride);
verts->pos.x = xy_[0] * scale_x; verts->pos.x = xy_[0] * scale_x;
verts->pos.y = xy_[1] * scale_y; verts->pos.y = xy_[1] * scale_y;
@ -1908,7 +1907,7 @@ D3D11_QueueGeometry(SDL_Renderer *renderer, SDL_RenderCommand *cmd, SDL_Texture
verts->color.w = col_.a / 255.0f; verts->color.w = col_.a / 255.0f;
if (texture) { if (texture) {
float *uv_ = (float *)((char*)uv + j * uv_stride); float *uv_ = (float *)((char*)uv + j * uv_stride);
verts->tex.x = uv_[0]; verts->tex.x = uv_[0];
verts->tex.y = uv_[1]; verts->tex.y = uv_[1];
} else { } else {

7
src/render/opengl/SDL_render_gl.c
View file

@ -21,7 +21,6 @@
#include "../../SDL_internal.h" #include "../../SDL_internal.h"
#if SDL_VIDEO_RENDER_OGL && !SDL_RENDER_DISABLED #if SDL_VIDEO_RENDER_OGL && !SDL_RENDER_DISABLED
#include "SDL_hints.h" #include "SDL_hints.h"
#include "SDL_opengl.h" #include "SDL_opengl.h"
#include "../SDL_sysrender.h" #include "../SDL_sysrender.h"
@ -1077,6 +1076,8 @@ GL_QueueGeometry(SDL_Renderer *renderer, SDL_RenderCommand *cmd, SDL_Texture *te
for (i = 0; i < count; i++) { for (i = 0; i < count; i++) {
int j; int j;
float *xy_;
SDL_Color col_;
if (size_indice == 4) { if (size_indice == 4) {
j = ((const Uint32 *)indices)[i]; j = ((const Uint32 *)indices)[i];
} else if (size_indice == 2) { } else if (size_indice == 2) {
@ -1087,8 +1088,8 @@ GL_QueueGeometry(SDL_Renderer *renderer, SDL_RenderCommand *cmd, SDL_Texture *te
j = i; j = i;
} }
float *xy_ = (float *)((char*)xy + j * xy_stride); xy_ = (float *)((char*)xy + j * xy_stride);
SDL_Color col_ = *(SDL_Color *)((char*)color + j * color_stride); col_ = *(SDL_Color *)((char*)color + j * color_stride);
*(verts++) = xy_[0] * scale_x; *(verts++) = xy_[0] * scale_x;
*(verts++) = xy_[1] * scale_y; *(verts++) = xy_[1] * scale_y;

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

@ -979,6 +979,8 @@ GLES2_QueueGeometry(SDL_Renderer *renderer, SDL_RenderCommand *cmd, SDL_Texture
for (i = 0; i < count; i++) { for (i = 0; i < count; i++) {
int j; int j;
float *xy_;
SDL_Color col_;
if (size_indice == 4) { if (size_indice == 4) {
j = ((const Uint32 *)indices)[i]; j = ((const Uint32 *)indices)[i];
} else if (size_indice == 2) { } else if (size_indice == 2) {
@ -989,8 +991,8 @@ GLES2_QueueGeometry(SDL_Renderer *renderer, SDL_RenderCommand *cmd, SDL_Texture
j = i; j = i;
} }
float *xy_ = (float *)((char*)xy + j * xy_stride); xy_ = (float *)((char*)xy + j * xy_stride);
SDL_Color col_ = *(SDL_Color *)((char*)color + j * color_stride); col_ = *(SDL_Color *)((char*)color + j * color_stride);
*(verts++) = xy_[0] * scale_x; *(verts++) = xy_[0] * scale_x;
*(verts++) = xy_[1] * scale_y; *(verts++) = xy_[1] * scale_y;

15
src/render/software/SDL_render_sw.c
View file

@ -597,6 +597,9 @@ SW_QueueGeometry(SDL_Renderer *renderer, SDL_RenderCommand *cmd, SDL_Texture *te
GeometryCopyData *ptr = (GeometryCopyData *) verts; GeometryCopyData *ptr = (GeometryCopyData *) verts;
for (i = 0; i < count; i++) { for (i = 0; i < count; i++) {
int j; int j;
float *xy_;
SDL_Color col_;
float *uv_;
if (size_indice == 4) { if (size_indice == 4) {
j = ((const Uint32 *)indices)[i]; j = ((const Uint32 *)indices)[i];
} else if (size_indice == 2) { } else if (size_indice == 2) {
@ -607,10 +610,10 @@ SW_QueueGeometry(SDL_Renderer *renderer, SDL_RenderCommand *cmd, SDL_Texture *te
j = i; j = i;
} }
float *xy_ = (float *)((char*)xy + j * xy_stride); xy_ = (float *)((char*)xy + j * xy_stride);
SDL_Color col_ = *(SDL_Color *)((char*)color + j * color_stride); col_ = *(SDL_Color *)((char*)color + j * color_stride);
float *uv_ = (float *)((char*)uv + j * uv_stride); uv_ = (float *)((char*)uv + j * uv_stride);
ptr->src.x = uv_[0] * texture->w; ptr->src.x = uv_[0] * texture->w;
ptr->src.y = uv_[1] * texture->h; ptr->src.y = uv_[1] * texture->h;
@ -628,6 +631,8 @@ SW_QueueGeometry(SDL_Renderer *renderer, SDL_RenderCommand *cmd, SDL_Texture *te
for (i = 0; i < count; i++) { for (i = 0; i < count; i++) {
int j; int j;
float *xy_;
SDL_Color col_;
if (size_indice == 4) { if (size_indice == 4) {
j = ((const Uint32 *)indices)[i]; j = ((const Uint32 *)indices)[i];
} else if (size_indice == 2) { } else if (size_indice == 2) {
@ -638,8 +643,8 @@ SW_QueueGeometry(SDL_Renderer *renderer, SDL_RenderCommand *cmd, SDL_Texture *te
j = i; j = i;
} }
float *xy_ = (float *)((char*)xy + j * xy_stride); xy_ = (float *)((char*)xy + j * xy_stride);
SDL_Color col_ = *(SDL_Color *)((char*)color + j * color_stride); col_ = *(SDL_Color *)((char*)color + j * color_stride);
ptr->dst.x = xy_[0] * scale_x + renderer->viewport.x; ptr->dst.x = xy_[0] * scale_x + renderer->viewport.x;
ptr->dst.y = xy_[1] * scale_y + renderer->viewport.y; ptr->dst.y = xy_[1] * scale_y + renderer->viewport.y;