mirror/RetroArch
1
0
Fork 0
mirror of https://github.com/libretro/RetroArch synced 2025-03-02 19:13:34 +00:00
Code Issues Packages Projects Releases Wiki Activity

Revert "Update diff.diff"

Browse Source 
This reverts commit 47feb65eda42f1db15d1a894d79f606399c5665e.
This commit is contained in:
twinaphex 2016-11-10 18:26:29 +01:00
parent 47feb65eda
commit 25c46aa7b2
1 changed files with 43 additions and 193 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

236
diff.diff
View File

@ -1,159 +1,5 @@
diff --git a/diff.diff b/diff.diff
index 90d60f9..e69de29 100644
--- a/diff.diff
+++ b/diff.diff
@@ -1,149 +0,0 @@
-diff --git a/gfx/drivers_shader/shader_glsl.c b/gfx/drivers_shader/shader_glsl.c
-index 71201cc..41100a1 100644
---- a/gfx/drivers_shader/shader_glsl.c
-+++ b/gfx/drivers_shader/shader_glsl.c
-@@ -725,7 +725,7 @@ static void *gl_glsl_init(void *data, const char *path)
- config_file_t *conf = NULL;
- const char *stock_vertex = NULL;
- const char *stock_fragment = NULL;
-- glsl_shader_data_t *glsl = (glsl_shader_data_t*)
-+ glsl_shader_data_t *glsl = (glsl_shader_data_t*)
- calloc(1, sizeof(glsl_shader_data_t));
-
- if (!glsl)
-@@ -991,8 +991,8 @@ static void gl_glsl_set_uniform_parameter(
- struct uniform_info *param,
- void *uniform_data)
- {
-- GLint location = 0;
-- glsl_shader_data_t *glsl = (glsl_shader_data_t*)data;
-+ GLint location = 0;
-+ glsl_shader_data_t *glsl = (glsl_shader_data_t*)data;
-
- if (!param)
- return;
-@@ -1052,15 +1052,16 @@ static void gl_glsl_set_params(void *data, void *shader_data,
- GLfloat buffer[512];
- struct glsl_attrib attribs[32];
- float input_size[2], output_size[2], texture_size[2];
-- unsigned texunit = 1;
-- const struct shader_uniforms *uni = NULL;
-- size_t size = 0, attribs_size = 0;
-- const struct video_tex_info *info = (const struct video_tex_info*)_info;
-- const struct video_tex_info *prev_info = (const struct video_tex_info*)_prev_info;
-+ unsigned texunit = 1;
-+ const struct shader_uniforms *uni = NULL;
-+ size_t size = 0;
-+ size_t attribs_size = 0;
-+ const struct video_tex_info *info = (const struct video_tex_info*)_info;
-+ const struct video_tex_info *prev_info = (const struct video_tex_info*)_prev_info;
- const struct video_tex_info *feedback_info = (const struct video_tex_info*)_feedback_info;
-- const struct video_tex_info *fbo_info = (const struct video_tex_info*)_fbo_info;
-- struct glsl_attrib *attr = (struct glsl_attrib*)attribs;
-- glsl_shader_data_t *glsl = (glsl_shader_data_t*)shader_data;
-+ const struct video_tex_info *fbo_info = (const struct video_tex_info*)_fbo_info;
-+ struct glsl_attrib *attr = (struct glsl_attrib*)attribs;
-+ glsl_shader_data_t *glsl = (glsl_shader_data_t*)shader_data;
-
- if (!glsl)
- return;
-@@ -1133,13 +1134,15 @@ static void gl_glsl_set_params(void *data, void *shader_data,
- /* Pass texture coordinates. */
- if (uni->orig.tex_coord >= 0)
- {
-+ unsigned y;
- attr->loc = uni->orig.tex_coord;
- attr->size = 2;
- attr->offset = size * sizeof(GLfloat);
- attribs_size++;
- attr++;
-
-- memcpy(buffer + size, info->coord, 8 * sizeof(GLfloat));
-+ for (y = 0; y < 8; y++)
-+ buffer[y + size] = info->coord[y];
- size += 8;
- }
-
-@@ -1162,13 +1165,15 @@ static void gl_glsl_set_params(void *data, void *shader_data,
- /* Pass texture coordinates. */
- if (uni->feedback.tex_coord >= 0)
- {
-+ unsigned y;
- attr->loc = uni->feedback.tex_coord;
- attr->size = 2;
- attr->offset = size * sizeof(GLfloat);
- attribs_size++;
- attr++;
-
-- memcpy(buffer + size, feedback_info->coord, 8 * sizeof(GLfloat));
-+ for (y = 0; y < 8; y++)
-+ buffer[y + size] = feedback_info->coord[y];
- size += 8;
- }
-
-@@ -1191,13 +1196,15 @@ static void gl_glsl_set_params(void *data, void *shader_data,
-
- if (uni->pass[i].tex_coord >= 0)
- {
-+ unsigned y;
- attr->loc = uni->pass[i].tex_coord;
- attr->size = 2;
- attr->offset = size * sizeof(GLfloat);
- attribs_size++;
- attr++;
-
-- memcpy(buffer + size, fbo_info[i].coord, 8 * sizeof(GLfloat));
-+ for (y = 0; y < 8; y++)
-+ buffer[y + size] = fbo_info[i].coord[y];
- size += 8;
- }
- }
-@@ -1224,13 +1231,15 @@ static void gl_glsl_set_params(void *data, void *shader_data,
- /* Pass texture coordinates. */
- if (uni->prev[i].tex_coord >= 0)
- {
-+ unsigned y;
- attr->loc = uni->prev[i].tex_coord;
- attr->size = 2;
- attr->offset = size * sizeof(GLfloat);
- attribs_size++;
- attr++;
-
-- memcpy(buffer + size, prev_info[i].coord, 8 * sizeof(GLfloat));
-+ for (y = 0; y < 8; y++)
-+ buffer[y + size] = prev_info[i].coord[y];
- size += 8;
- }
- }
-@@ -1301,13 +1310,14 @@ fallback:
-
- #define gl_glsl_set_coord_array(attr, coord1, coord2, coords, size, multiplier) \
- { \
-+ unsigned y; \
- attr->loc = coord1; \
- attr->size = multiplier; \
- attr->offset = size * sizeof(GLfloat); \
- attribs_size++; \
- attr++; \
-- memcpy(buffer + size, coord2, \
-- multiplier * coords->vertices * sizeof(GLfloat)); \
-+ for (y = 0; y < (multiplier * coords->vertices); y++) \
-+ buffer[y + size] = coord2[y]; \
- size += multiplier * coords->vertices; \
- }
-
-@@ -1317,10 +1327,11 @@ static bool gl_glsl_set_coords(void *handle_data, void *shader_data, const struc
- GLfloat short_buffer[4 * (2 + 2 + 4 + 2)];
- GLfloat *buffer;
- struct glsl_attrib attribs[4];
-- size_t attribs_size = 0, size = 0;
-- struct glsl_attrib *attr = NULL;
-+ size_t attribs_size = 0;
-+ size_t size = 0;
-+ struct glsl_attrib *attr = NULL;
- const struct shader_uniforms *uni = NULL;
-- glsl_shader_data_t *glsl = (glsl_shader_data_t*)shader_data;
-+ glsl_shader_data_t *glsl = (glsl_shader_data_t*)shader_data;
-
- if (!glsl || !glsl->shader->modern || !coords)
- goto fallback;
diff --git a/gfx/drivers_shader/shader_glsl.c b/gfx/drivers_shader/shader_glsl.c
index 71201cc..25ec5cc 100644
index 71201cc..41100a1 100644
--- a/gfx/drivers_shader/shader_glsl.c
+++ b/gfx/drivers_shader/shader_glsl.c
@@ -725,7 +725,7 @@ static void *gl_glsl_init(void *data, const char *path)
@ -201,71 +47,75 @@ index 71201cc..25ec5cc 100644
if (!glsl)
return;
@@ -1139,7 +1140,14 @@ static void gl_glsl_set_params(void *data, void *shader_data,
@@ -1133,13 +1134,15 @@ static void gl_glsl_set_params(void *data, void *shader_data,
/* Pass texture coordinates. */
if (uni->orig.tex_coord >= 0)
{
+ unsigned y;
attr->loc = uni->orig.tex_coord;
attr->size = 2;
attr->offset = size * sizeof(GLfloat);
attribs_size++;
attr++;
- memcpy(buffer + size, info->coord, 8 * sizeof(GLfloat));
+ buffer[size] = info->coord[0];
+ buffer[size + 1] = info->coord[1];
+ buffer[size + 2] = info->coord[2];
+ buffer[size + 3] = info->coord[3];
+ buffer[size + 4] = info->coord[4];
+ buffer[size + 5] = info->coord[5];
+ buffer[size + 6] = info->coord[6];
+ buffer[size + 7] = info->coord[7];
+ for (y = 0; y < 8; y++)
+ buffer[y + size] = info->coord[y];
size += 8;
}
@@ -1168,7 +1176,14 @@ static void gl_glsl_set_params(void *data, void *shader_data,
@@ -1162,13 +1165,15 @@ static void gl_glsl_set_params(void *data, void *shader_data,
/* Pass texture coordinates. */
if (uni->feedback.tex_coord >= 0)
{
+ unsigned y;
attr->loc = uni->feedback.tex_coord;
attr->size = 2;
attr->offset = size * sizeof(GLfloat);
attribs_size++;
attr++;
- memcpy(buffer + size, feedback_info->coord, 8 * sizeof(GLfloat));
+ buffer[size] = feedback_info->coord[0];
+ buffer[size+1] = feedback_info->coord[1];
+ buffer[size+2] = feedback_info->coord[2];
+ buffer[size+3] = feedback_info->coord[3];
+ buffer[size+4] = feedback_info->coord[4];
+ buffer[size+5] = feedback_info->coord[5];
+ buffer[size+6] = feedback_info->coord[6];
+ buffer[size+7] = feedback_info->coord[7];
+ for (y = 0; y < 8; y++)
+ buffer[y + size] = feedback_info->coord[y];
size += 8;
}
@@ -1197,7 +1212,14 @@ static void gl_glsl_set_params(void *data, void *shader_data,
@@ -1191,13 +1196,15 @@ static void gl_glsl_set_params(void *data, void *shader_data,
if (uni->pass[i].tex_coord >= 0)
{
+ unsigned y;
attr->loc = uni->pass[i].tex_coord;
attr->size = 2;
attr->offset = size * sizeof(GLfloat);
attribs_size++;
attr++;
- memcpy(buffer + size, fbo_info[i].coord, 8 * sizeof(GLfloat));
+ buffer[size] = fbo_info[i].coord[0];
+ buffer[size + 1] = fbo_info[i].coord[1];
+ buffer[size + 2] = fbo_info[i].coord[2];
+ buffer[size + 3] = fbo_info[i].coord[3];
+ buffer[size + 4] = fbo_info[i].coord[4];
+ buffer[size + 5] = fbo_info[i].coord[5];
+ buffer[size + 6] = fbo_info[i].coord[6];
+ buffer[size + 7] = fbo_info[i].coord[7];
+ for (y = 0; y < 8; y++)
+ buffer[y + size] = fbo_info[i].coord[y];
size += 8;
}
}
@@ -1230,7 +1252,14 @@ static void gl_glsl_set_params(void *data, void *shader_data,
@@ -1224,13 +1231,15 @@ static void gl_glsl_set_params(void *data, void *shader_data,
/* Pass texture coordinates. */
if (uni->prev[i].tex_coord >= 0)
{
+ unsigned y;
attr->loc = uni->prev[i].tex_coord;
attr->size = 2;
attr->offset = size * sizeof(GLfloat);
attribs_size++;
attr++;
- memcpy(buffer + size, prev_info[i].coord, 8 * sizeof(GLfloat));
+ buffer[size] = prev_info[i].coord[0];
+ buffer[size + 1] = prev_info[i].coord[1];
+ buffer[size + 2] = prev_info[i].coord[2];
+ buffer[size + 3] = prev_info[i].coord[3];
+ buffer[size + 4] = prev_info[i].coord[4];
+ buffer[size + 5] = prev_info[i].coord[5];
+ buffer[size + 6] = prev_info[i].coord[6];
+ buffer[size + 7] = prev_info[i].coord[7];
+ for (y = 0; y < 8; y++)
+ buffer[y + size] = prev_info[i].coord[y];
size += 8;
}
}
@@ -1301,13 +1330,14 @@ fallback:
@@ -1301,13 +1310,14 @@ fallback:
#define gl_glsl_set_coord_array(attr, coord1, coord2, coords, size, multiplier) \
{ \
@ -282,7 +132,7 @@ index 71201cc..25ec5cc 100644
size += multiplier * coords->vertices; \
}
@@ -1317,10 +1347,11 @@ static bool gl_glsl_set_coords(void *handle_data, void *shader_data, const struc
@@ -1317,10 +1327,11 @@ static bool gl_glsl_set_coords(void *handle_data, void *shader_data, const struc
GLfloat short_buffer[4 * (2 + 2 + 4 + 2)];
GLfloat *buffer;
struct glsl_attrib attribs[4];