This commit is contained in:
twinaphex 2017-03-07 12:37:11 +01:00
parent cb1c8df547
commit f4ac760178

View File

@ -1386,7 +1386,6 @@ fallback:
}
#define gl_glsl_set_coord_array(attr, coord1, coord2, coords, size, multiplier) \
{ \
unsigned y; \
attr->loc = coord1; \
attr->size = multiplier; \
@ -1395,7 +1394,6 @@ fallback:
for (y = 0; y < (multiplier * coords->vertices); y++) \
buffer[y + size] = coord2[y]; \
size += multiplier * coords->vertices; \
}
static bool gl_glsl_set_coords(void *handle_data, void *shader_data, const struct video_coords *coords)
{
@ -1434,25 +1432,29 @@ static bool gl_glsl_set_coords(void *handle_data, void *shader_data, const struc
if (uni->tex_coord >= 0)
{
gl_glsl_set_coord_array(attr, uni->tex_coord, coords->tex_coord, coords, size, 2);
gl_glsl_set_coord_array(attr, uni->tex_coord,
coords->tex_coord, coords, size, 2);
attribs_size++;
}
if (uni->vertex_coord >= 0)
{
gl_glsl_set_coord_array(attr, uni->vertex_coord, coords->vertex, coords, size, 2);
gl_glsl_set_coord_array(attr, uni->vertex_coord,
coords->vertex, coords, size, 2);
attribs_size++;
}
if (uni->color >= 0)
{
gl_glsl_set_coord_array(attr, uni->color, coords->color, coords, size, 4);
gl_glsl_set_coord_array(attr, uni->color,
coords->color, coords, size, 4);
attribs_size++;
}
if (uni->lut_tex_coord >= 0)
{
gl_glsl_set_coord_array(attr, uni->lut_tex_coord, coords->lut_tex_coord, coords, size, 2);
gl_glsl_set_coord_array(attr, uni->lut_tex_coord,
coords->lut_tex_coord, coords, size, 2);
attribs_size++;
}