st/xorg: remove deprecated rendering code
This commit is contained in:
@@ -469,19 +469,11 @@ void xorg_composite(struct exa_context *exa,
|
||||
if (exa->transform.has_mask)
|
||||
mask_matrix = exa->transform.mask;
|
||||
|
||||
#if 0
|
||||
renderer_draw_textures(exa->renderer,
|
||||
pos, width, height,
|
||||
exa->bound_textures,
|
||||
exa->num_bound_samplers,
|
||||
src_matrix, mask_matrix);
|
||||
#else
|
||||
renderer_texture(exa->renderer,
|
||||
pos, width, height,
|
||||
exa->bound_textures,
|
||||
exa->num_bound_samplers,
|
||||
src_matrix, mask_matrix);
|
||||
#endif
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@@ -947,54 +947,3 @@ void renderer_texture(struct xorg_renderer *r,
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
void renderer_draw_textures(struct xorg_renderer *r,
|
||||
int *pos,
|
||||
int width, int height,
|
||||
struct pipe_texture **textures,
|
||||
int num_textures,
|
||||
float *src_matrix, float *mask_matrix)
|
||||
{
|
||||
#if 0
|
||||
if (src_matrix) {
|
||||
debug_printf("src_matrix = \n");
|
||||
debug_printf("%f, %f, %f\n", src_matrix[0], src_matrix[1], src_matrix[2]);
|
||||
debug_printf("%f, %f, %f\n", src_matrix[3], src_matrix[4], src_matrix[5]);
|
||||
debug_printf("%f, %f, %f\n", src_matrix[6], src_matrix[7], src_matrix[8]);
|
||||
}
|
||||
if (mask_matrix) {
|
||||
debug_printf("mask_matrix = \n");
|
||||
debug_printf("%f, %f, %f\n", mask_matrix[0], mask_matrix[1], mask_matrix[2]);
|
||||
debug_printf("%f, %f, %f\n", mask_matrix[3], mask_matrix[4], mask_matrix[5]);
|
||||
debug_printf("%f, %f, %f\n", mask_matrix[6], mask_matrix[7], mask_matrix[8]);
|
||||
}
|
||||
#endif
|
||||
|
||||
r->num_attributes = 1 + num_textures;
|
||||
switch(num_textures) {
|
||||
case 1:
|
||||
add_vertex_data1(r,
|
||||
pos[0], pos[1], /* src */
|
||||
pos[4], pos[5], /* dst */
|
||||
width, height,
|
||||
textures[0], src_matrix);
|
||||
break;
|
||||
case 2:
|
||||
add_vertex_data2(r,
|
||||
pos[0], pos[1], /* src */
|
||||
pos[2], pos[3], /* mask */
|
||||
pos[4], pos[5], /* dst */
|
||||
width, height,
|
||||
textures[0], textures[1],
|
||||
src_matrix, mask_matrix);
|
||||
break;
|
||||
case 3:
|
||||
default:
|
||||
debug_assert(!"Unsupported number of textures");
|
||||
break;
|
||||
}
|
||||
|
||||
renderer_draw(r);
|
||||
}
|
||||
|
||||
|
||||
@@ -73,12 +73,4 @@ void renderer_texture(struct xorg_renderer *r,
|
||||
void renderer_draw_flush(struct xorg_renderer *r);
|
||||
|
||||
|
||||
void renderer_draw_textures(struct xorg_renderer *r,
|
||||
int *pos,
|
||||
int width, int height,
|
||||
struct pipe_texture **textures,
|
||||
int num_textures,
|
||||
float *src_matrix, float *mask_matrix);
|
||||
|
||||
|
||||
#endif
|
||||
|
||||
Reference in New Issue
Block a user