brl/mutter
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

CoglTexture2DSliced: Handle TEXTURE_RECTANGLE_ARB

Browse Source 
In _cogl_texture_2d_sliced_foreach_sub_texture_in_region(), don't
assert that the target is GL_TEXTURE_2D; instead conditionalize
normalization on the target.

http://bugzilla.openedhand.com/show_bug.cgi?id=2015
This commit is contained in:
Owen W. Taylor 2010-03-01 14:04:20 -05:00 committed by Neil Roberts
parent edecd668c8
commit ec9adfd1d4
1 changed files with 13 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
cogl/cogl-texture-2d-sliced.c
View File

@ -77,8 +77,6 @@ _cogl_texture_2d_sliced_foreach_sub_texture_in_region (
CoglSpanIter iter_x; CoglSpanIter iter_x;
CoglSpanIter iter_y; CoglSpanIter iter_y;
g_assert (tex_2ds->gl_target == GL_TEXTURE_2D);
/* Slice spans are stored in denormalized coordinates, and this is what /* Slice spans are stored in denormalized coordinates, and this is what
* the _cogl_span_iter_* funcs expect to be given, so we scale the given * the _cogl_span_iter_* funcs expect to be given, so we scale the given
* virtual coordinates by the texture size to denormalize. * virtual coordinates by the texture size to denormalize.
@ -118,9 +116,12 @@ _cogl_texture_2d_sliced_foreach_sub_texture_in_region (
slice_ty1 = y_intersect_start - iter_y.pos; slice_ty1 = y_intersect_start - iter_y.pos;
slice_ty2 = y_intersect_end - iter_y.pos; slice_ty2 = y_intersect_end - iter_y.pos;
/* Normalize slice texture coordinates */ if (tex_2ds->gl_target == GL_TEXTURE_2D)
slice_ty1 /= iter_y.span->size; {
slice_ty2 /= iter_y.span->size; /* Normalize slice texture coordinates */
slice_ty1 /= iter_y.span->size;
slice_ty2 /= iter_y.span->size;
}
/* Iterate the x axis of the virtual rectangle */ /* Iterate the x axis of the virtual rectangle */
for (_cogl_span_iter_begin (&iter_x, for (_cogl_span_iter_begin (&iter_x,
@ -153,15 +154,18 @@ _cogl_texture_2d_sliced_foreach_sub_texture_in_region (
slice_tx1 = x_intersect_start - iter_x.pos; slice_tx1 = x_intersect_start - iter_x.pos;
slice_tx2 = x_intersect_end - iter_x.pos; slice_tx2 = x_intersect_end - iter_x.pos;
/* Normalize slice texture coordinates */
slice_tx1 /= iter_x.span->size;
slice_tx2 /= iter_x.span->size;
/* Pluck out opengl texture object for this slice */ /* Pluck out opengl texture object for this slice */
gl_handle = g_array_index (tex_2ds->slice_gl_handles, GLuint, gl_handle = g_array_index (tex_2ds->slice_gl_handles, GLuint,
iter_y.index * iter_x.array->len + iter_y.index * iter_x.array->len +
iter_x.index); iter_x.index);
if (tex_2ds->gl_target == GL_TEXTURE_2D)
{
/* Normalize slice texture coordinates */
slice_tx1 /= iter_x.span->size;
slice_tx2 /= iter_x.span->size;
}
slice_coords[0] = slice_tx1; slice_coords[0] = slice_tx1;
slice_coords[1] = slice_ty1; slice_coords[1] = slice_ty1;
slice_coords[2] = slice_tx2; slice_coords[2] = slice_tx2;