diff options
author | marha <marha@users.sourceforge.net> | 2011-10-10 08:28:58 +0200 |
---|---|---|
committer | marha <marha@users.sourceforge.net> | 2011-10-10 08:28:58 +0200 |
commit | baf98f9bb36f956245d83ecd04f90625d6d68d2b (patch) | |
tree | c4af86b7cdb9c57cc539fa0764050865233e3617 /mesalib/src/mesa/swrast/s_texfilter.c | |
parent | 7fae5492e3ef8e5fa15f742be4c2a15b9782e89a (diff) | |
parent | afbd3947071a33f59dda122f1ac396442a02c128 (diff) | |
download | vcxsrv-baf98f9bb36f956245d83ecd04f90625d6d68d2b.tar.gz vcxsrv-baf98f9bb36f956245d83ecd04f90625d6d68d2b.tar.bz2 vcxsrv-baf98f9bb36f956245d83ecd04f90625d6d68d2b.zip |
Merge remote-tracking branch 'origin/released'
Diffstat (limited to 'mesalib/src/mesa/swrast/s_texfilter.c')
-rw-r--r-- | mesalib/src/mesa/swrast/s_texfilter.c | 80 |
1 files changed, 41 insertions, 39 deletions
diff --git a/mesalib/src/mesa/swrast/s_texfilter.c b/mesalib/src/mesa/swrast/s_texfilter.c index ca9133b21..f8b0fa1aa 100644 --- a/mesalib/src/mesa/swrast/s_texfilter.c +++ b/mesalib/src/mesa/swrast/s_texfilter.c @@ -815,7 +815,7 @@ sample_1d_nearest(struct gl_context *ctx, get_border_color(tObj, img, rgba); } else { - swImg->FetchTexelf(swImg, i, 0, 0, rgba); + swImg->FetchTexel(swImg, i, 0, 0, rgba); } } @@ -852,13 +852,13 @@ sample_1d_linear(struct gl_context *ctx, get_border_color(tObj, img, t0); } else { - swImg->FetchTexelf(swImg, i0, 0, 0, t0); + swImg->FetchTexel(swImg, i0, 0, 0, t0); } if (useBorderColor & I1BIT) { get_border_color(tObj, img, t1); } else { - swImg->FetchTexelf(swImg, i1, 0, 0, t1); + swImg->FetchTexel(swImg, i1, 0, 0, t1); } lerp_rgba(rgba, a, t0, t1); @@ -1082,7 +1082,7 @@ sample_2d_nearest(struct gl_context *ctx, get_border_color(tObj, img, rgba); } else { - swImg->FetchTexelf(swImg, i, j, 0, rgba); + swImg->FetchTexel(swImg, i, j, 0, rgba); } } @@ -1127,25 +1127,25 @@ sample_2d_linear(struct gl_context *ctx, get_border_color(tObj, img, t00); } else { - swImg->FetchTexelf(swImg, i0, j0, 0, t00); + swImg->FetchTexel(swImg, i0, j0, 0, t00); } if (useBorderColor & (I1BIT | J0BIT)) { get_border_color(tObj, img, t10); } else { - swImg->FetchTexelf(swImg, i1, j0, 0, t10); + swImg->FetchTexel(swImg, i1, j0, 0, t10); } if (useBorderColor & (I0BIT | J1BIT)) { get_border_color(tObj, img, t01); } else { - swImg->FetchTexelf(swImg, i0, j1, 0, t01); + swImg->FetchTexel(swImg, i0, j1, 0, t01); } if (useBorderColor & (I1BIT | J1BIT)) { get_border_color(tObj, img, t11); } else { - swImg->FetchTexelf(swImg, i1, j1, 0, t11); + swImg->FetchTexel(swImg, i1, j1, 0, t11); } lerp_rgba_2d(rgba, a, b, t00, t10, t01, t11); @@ -1180,10 +1180,10 @@ sample_2d_linear_repeat(struct gl_context *ctx, linear_repeat_texel_location(width, texcoord[0], &i0, &i1, &wi); linear_repeat_texel_location(height, texcoord[1], &j0, &j1, &wj); - swImg->FetchTexelf(swImg, i0, j0, 0, t00); - swImg->FetchTexelf(swImg, i1, j0, 0, t10); - swImg->FetchTexelf(swImg, i0, j1, 0, t01); - swImg->FetchTexelf(swImg, i1, j1, 0, t11); + swImg->FetchTexel(swImg, i0, j0, 0, t00); + swImg->FetchTexel(swImg, i1, j0, 0, t10); + swImg->FetchTexel(swImg, i0, j1, 0, t01); + swImg->FetchTexel(swImg, i1, j1, 0, t11); lerp_rgba_2d(rgba, wi, wj, t00, t10, t01, t11); } @@ -1369,6 +1369,7 @@ opt_sample_rgb_2d(struct gl_context *ctx, ASSERT(img->Border==0); ASSERT(img->TexFormat == MESA_FORMAT_RGB888); ASSERT(swImg->_IsPowerOfTwo); + (void) swImg; for (k=0; k<n; k++) { GLint i = IFLOOR(texcoords[k][0] * width) & colMask; @@ -1412,6 +1413,7 @@ opt_sample_rgba_2d(struct gl_context *ctx, ASSERT(img->Border==0); ASSERT(img->TexFormat == MESA_FORMAT_RGBA8888); ASSERT(swImg->_IsPowerOfTwo); + (void) swImg; for (i = 0; i < n; i++) { const GLint col = IFLOOR(texcoords[i][0] * width) & colMask; @@ -1966,7 +1968,7 @@ sample_3d_nearest(struct gl_context *ctx, get_border_color(tObj, img, rgba); } else { - swImg->FetchTexelf(swImg, i, j, k, rgba); + swImg->FetchTexel(swImg, i, j, k, rgba); } } @@ -2018,50 +2020,50 @@ sample_3d_linear(struct gl_context *ctx, get_border_color(tObj, img, t000); } else { - swImg->FetchTexelf(swImg, i0, j0, k0, t000); + swImg->FetchTexel(swImg, i0, j0, k0, t000); } if (useBorderColor & (I1BIT | J0BIT | K0BIT)) { get_border_color(tObj, img, t100); } else { - swImg->FetchTexelf(swImg, i1, j0, k0, t100); + swImg->FetchTexel(swImg, i1, j0, k0, t100); } if (useBorderColor & (I0BIT | J1BIT | K0BIT)) { get_border_color(tObj, img, t010); } else { - swImg->FetchTexelf(swImg, i0, j1, k0, t010); + swImg->FetchTexel(swImg, i0, j1, k0, t010); } if (useBorderColor & (I1BIT | J1BIT | K0BIT)) { get_border_color(tObj, img, t110); } else { - swImg->FetchTexelf(swImg, i1, j1, k0, t110); + swImg->FetchTexel(swImg, i1, j1, k0, t110); } if (useBorderColor & (I0BIT | J0BIT | K1BIT)) { get_border_color(tObj, img, t001); } else { - swImg->FetchTexelf(swImg, i0, j0, k1, t001); + swImg->FetchTexel(swImg, i0, j0, k1, t001); } if (useBorderColor & (I1BIT | J0BIT | K1BIT)) { get_border_color(tObj, img, t101); } else { - swImg->FetchTexelf(swImg, i1, j0, k1, t101); + swImg->FetchTexel(swImg, i1, j0, k1, t101); } if (useBorderColor & (I0BIT | J1BIT | K1BIT)) { get_border_color(tObj, img, t011); } else { - swImg->FetchTexelf(swImg, i0, j1, k1, t011); + swImg->FetchTexel(swImg, i0, j1, k1, t011); } if (useBorderColor & (I1BIT | J1BIT | K1BIT)) { get_border_color(tObj, img, t111); } else { - swImg->FetchTexelf(swImg, i1, j1, k1, t111); + swImg->FetchTexel(swImg, i1, j1, k1, t111); } /* trilinear interpolation of samples */ @@ -2582,7 +2584,7 @@ sample_nearest_rect(struct gl_context *ctx, if (col < 0 || col >= width || row < 0 || row >= height) get_border_color(tObj, img, rgba[i]); else - swImg->FetchTexelf(swImg, col, row, 0, rgba[i]); + swImg->FetchTexel(swImg, col, row, 0, rgba[i]); } } @@ -2630,22 +2632,22 @@ sample_linear_rect(struct gl_context *ctx, if (useBorderColor & (I0BIT | J0BIT)) get_border_color(tObj, img, t00); else - swImg->FetchTexelf(swImg, i0, j0, 0, t00); + swImg->FetchTexel(swImg, i0, j0, 0, t00); if (useBorderColor & (I1BIT | J0BIT)) get_border_color(tObj, img, t10); else - swImg->FetchTexelf(swImg, i1, j0, 0, t10); + swImg->FetchTexel(swImg, i1, j0, 0, t10); if (useBorderColor & (I0BIT | J1BIT)) get_border_color(tObj, img, t01); else - swImg->FetchTexelf(swImg, i0, j1, 0, t01); + swImg->FetchTexel(swImg, i0, j1, 0, t01); if (useBorderColor & (I1BIT | J1BIT)) get_border_color(tObj, img, t11); else - swImg->FetchTexelf(swImg, i1, j1, 0, t11); + swImg->FetchTexel(swImg, i1, j1, 0, t11); lerp_rgba_2d(rgba[i], a, b, t00, t10, t01, t11); } @@ -2723,7 +2725,7 @@ sample_2d_array_nearest(struct gl_context *ctx, get_border_color(tObj, img, rgba); } else { - swImg->FetchTexelf(swImg, i, j, array, rgba); + swImg->FetchTexel(swImg, i, j, array, rgba); } } @@ -2775,25 +2777,25 @@ sample_2d_array_linear(struct gl_context *ctx, get_border_color(tObj, img, t00); } else { - swImg->FetchTexelf(swImg, i0, j0, array, t00); + swImg->FetchTexel(swImg, i0, j0, array, t00); } if (useBorderColor & (I1BIT | J0BIT)) { get_border_color(tObj, img, t10); } else { - swImg->FetchTexelf(swImg, i1, j0, array, t10); + swImg->FetchTexel(swImg, i1, j0, array, t10); } if (useBorderColor & (I0BIT | J1BIT)) { get_border_color(tObj, img, t01); } else { - swImg->FetchTexelf(swImg, i0, j1, array, t01); + swImg->FetchTexel(swImg, i0, j1, array, t01); } if (useBorderColor & (I1BIT | J1BIT)) { get_border_color(tObj, img, t11); } else { - swImg->FetchTexelf(swImg, i1, j1, array, t11); + swImg->FetchTexel(swImg, i1, j1, array, t11); } /* trilinear interpolation of samples */ @@ -3032,7 +3034,7 @@ sample_1d_array_nearest(struct gl_context *ctx, get_border_color(tObj, img, rgba); } else { - swImg->FetchTexelf(swImg, i, array, 0, rgba); + swImg->FetchTexel(swImg, i, array, 0, rgba); } } @@ -3076,13 +3078,13 @@ sample_1d_array_linear(struct gl_context *ctx, get_border_color(tObj, img, t0); } else { - swImg->FetchTexelf(swImg, i0, array, 0, t0); + swImg->FetchTexel(swImg, i0, array, 0, t0); } if (useBorderColor & (I1BIT | K0BIT)) { get_border_color(tObj, img, t1); } else { - swImg->FetchTexelf(swImg, i1, array, 0, t1); + swImg->FetchTexel(swImg, i1, array, 0, t1); } /* bilinear interpolation of samples */ @@ -3446,7 +3448,7 @@ sample_depth_texture( struct gl_context *ctx, if (col >= 0 && row >= 0 && col < width && row < height && slice >= 0 && slice < depth) { - swImg->FetchTexelf(swImg, col, row, slice, &depthSample); + swImg->FetchTexel(swImg, col, row, slice, &depthSample); } else { depthSample = tObj->Sampler.BorderColor.f[0]; @@ -3515,13 +3517,13 @@ sample_depth_texture( struct gl_context *ctx, depth00 = tObj->Sampler.BorderColor.f[0]; } else { - swImg->FetchTexelf(swImg, i0, j0, slice, &depth00); + swImg->FetchTexel(swImg, i0, j0, slice, &depth00); } if (useBorderTexel & (I1BIT | J0BIT)) { depth10 = tObj->Sampler.BorderColor.f[0]; } else { - swImg->FetchTexelf(swImg, i1, j0, slice, &depth10); + swImg->FetchTexel(swImg, i1, j0, slice, &depth10); } if (tObj->Target != GL_TEXTURE_1D_ARRAY_EXT) { @@ -3529,13 +3531,13 @@ sample_depth_texture( struct gl_context *ctx, depth01 = tObj->Sampler.BorderColor.f[0]; } else { - swImg->FetchTexelf(swImg, i0, j1, slice, &depth01); + swImg->FetchTexel(swImg, i0, j1, slice, &depth01); } if (useBorderTexel & (I1BIT | J1BIT)) { depth11 = tObj->Sampler.BorderColor.f[0]; } else { - swImg->FetchTexelf(swImg, i1, j1, slice, &depth11); + swImg->FetchTexel(swImg, i1, j1, slice, &depth11); } } else { |