OpenHarmony/third_party_mesa3d
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

mesa: move gl_texture_image::_IsPowerOfTwo into swrast

Browse Source 
It's only used by swrast.

Reviewed-by: Ian Romanick <ian.d.romanick@intel.com>
This commit is contained in:
Brian Paul
2011-09-21 18:54:53 -06:00
parent de414f4915
commit eaf376ba35
6 changed files with 32 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/mesa/main/mtypes.h
View File

@@ -1258,7 +1258,6 @@ struct gl_texture_image
GLfloat HeightScale; /**< used for mipmap LOD computation */ GLfloat HeightScale; /**< used for mipmap LOD computation */
GLfloat DepthScale; /**< used for mipmap LOD computation */ GLfloat DepthScale; /**< used for mipmap LOD computation */
GLboolean IsClientData; /**< Data owned by client? */ GLboolean IsClientData; /**< Data owned by client? */
GLboolean _IsPowerOfTwo; /**< Are all dimensions powers of two? */
struct gl_texture_object *TexObject; /**< Pointer back to parent object */ struct gl_texture_object *TexObject; /**< Pointer back to parent object */
GLuint Level; /**< Which mipmap level am I? */ GLuint Level; /**< Which mipmap level am I? */

7
src/mesa/main/teximage.c
View File

@@ -1159,13 +1159,6 @@ _mesa_init_teximage_fields(struct gl_context *ctx, GLenum target,
img->MaxLog2 = MAX2(img->WidthLog2, img->HeightLog2); img->MaxLog2 = MAX2(img->WidthLog2, img->HeightLog2);
if ((width == 1 || _mesa_is_pow_two(img->Width2)) &&
(height == 1 || _mesa_is_pow_two(img->Height2)) &&
(depth == 1 || _mesa_is_pow_two(img->Depth2)))
img->_IsPowerOfTwo = GL_TRUE;
else
img->_IsPowerOfTwo = GL_FALSE;
/* RowStride and ImageOffsets[] describe how to address texels in 'Data' */ /* RowStride and ImageOffsets[] describe how to address texels in 'Data' */
img->RowStride = width; img->RowStride = width;
/* Allocate the ImageOffsets array and initialize to typical values. /* Allocate the ImageOffsets array and initialize to typical values.

3
src/mesa/swrast/s_context.h
View File

@@ -139,10 +139,11 @@ struct swrast_texture_image
{ {
struct gl_texture_image Base; struct gl_texture_image Base;
GLboolean _IsPowerOfTwo; /**< Are all dimensions powers of two? */
#if 0 #if 0
/** used for mipmap LOD computation */ /** used for mipmap LOD computation */
GLfloat WidthScale, HeightScale, DepthScale; GLfloat WidthScale, HeightScale, DepthScale;
GLboolean _IsPowerOfTwo; /**< Are all dimensions powers of two? */
GLubyte *Data; /**< The actual texture data in malloc'd memory */ GLubyte *Data; /**< The actual texture data in malloc'd memory */

27
src/mesa/swrast/s_texfilter.c
View File

@@ -159,11 +159,12 @@ linear_texel_locations(GLenum wrapMode,
GLint size, GLfloat s, GLint size, GLfloat s,
GLint *i0, GLint *i1, GLfloat *weight) GLint *i0, GLint *i1, GLfloat *weight)
{ {
const struct swrast_texture_image *swImg = swrast_texture_image_const(img);
GLfloat u; GLfloat u;
switch (wrapMode) { switch (wrapMode) {
case GL_REPEAT: case GL_REPEAT:
u = s * size - 0.5F; u = s * size - 0.5F;
if (img->_IsPowerOfTwo) { if (swImg->_IsPowerOfTwo) {
*i0 = IFLOOR(u) & (size - 1); *i0 = IFLOOR(u) & (size - 1);
*i1 = (*i0 + 1) & (size - 1); *i1 = (*i0 + 1) & (size - 1);
} }
@@ -285,6 +286,7 @@ nearest_texel_location(GLenum wrapMode,
const struct gl_texture_image *img, const struct gl_texture_image *img,
GLint size, GLfloat s) GLint size, GLfloat s)
{ {
const struct swrast_texture_image *swImg = swrast_texture_image_const(img);
GLint i; GLint i;
switch (wrapMode) { switch (wrapMode) {
@@ -292,7 +294,7 @@ nearest_texel_location(GLenum wrapMode,
/* s limited to [0,1) */ /* s limited to [0,1) */
/* i limited to [0,size-1] */ /* i limited to [0,size-1] */
i = IFLOOR(s * size); i = IFLOOR(s * size);
if (img->_IsPowerOfTwo) if (swImg->_IsPowerOfTwo)
i &= (size - 1); i &= (size - 1);
else else
i = REMAINDER(i, size); i = REMAINDER(i, size);
@@ -1173,7 +1175,7 @@ sample_2d_linear_repeat(struct gl_context *ctx,
ASSERT(tObj->Sampler.WrapS == GL_REPEAT); ASSERT(tObj->Sampler.WrapS == GL_REPEAT);
ASSERT(tObj->Sampler.WrapT == GL_REPEAT); ASSERT(tObj->Sampler.WrapT == GL_REPEAT);
ASSERT(img->Border == 0); ASSERT(img->Border == 0);
ASSERT(img->_IsPowerOfTwo); ASSERT(swImg->_IsPowerOfTwo);
linear_repeat_texel_location(width, texcoord[0], &i0, &i1, &wi); linear_repeat_texel_location(width, texcoord[0], &i0, &i1, &wi);
linear_repeat_texel_location(height, texcoord[1], &j0, &j1, &wj); linear_repeat_texel_location(height, texcoord[1], &j0, &j1, &wj);
@@ -1320,10 +1322,11 @@ sample_linear_2d(struct gl_context *ctx,
{ {
GLuint i; GLuint i;
struct gl_texture_image *image = tObj->Image[0][tObj->BaseLevel]; struct gl_texture_image *image = tObj->Image[0][tObj->BaseLevel];
const struct swrast_texture_image *swImg = swrast_texture_image_const(image);
(void) lambda; (void) lambda;
if (tObj->Sampler.WrapS == GL_REPEAT && if (tObj->Sampler.WrapS == GL_REPEAT &&
tObj->Sampler.WrapT == GL_REPEAT && tObj->Sampler.WrapT == GL_REPEAT &&
image->_IsPowerOfTwo && swImg->_IsPowerOfTwo &&
image->Border == 0) { image->Border == 0) {
for (i = 0; i < n; i++) { for (i = 0; i < n; i++) {
sample_2d_linear_repeat(ctx, tObj, image, texcoords[i], rgba[i]); sample_2d_linear_repeat(ctx, tObj, image, texcoords[i], rgba[i]);
@@ -1352,6 +1355,7 @@ opt_sample_rgb_2d(struct gl_context *ctx,
const GLfloat lambda[], GLfloat rgba[][4]) const GLfloat lambda[], GLfloat rgba[][4])
{ {
const struct gl_texture_image *img = tObj->Image[0][tObj->BaseLevel]; const struct gl_texture_image *img = tObj->Image[0][tObj->BaseLevel];
const struct swrast_texture_image *swImg = swrast_texture_image_const(img);
const GLfloat width = (GLfloat) img->Width; const GLfloat width = (GLfloat) img->Width;
const GLfloat height = (GLfloat) img->Height; const GLfloat height = (GLfloat) img->Height;
const GLint colMask = img->Width - 1; const GLint colMask = img->Width - 1;
@@ -1364,7 +1368,7 @@ opt_sample_rgb_2d(struct gl_context *ctx,
ASSERT(tObj->Sampler.WrapT==GL_REPEAT); ASSERT(tObj->Sampler.WrapT==GL_REPEAT);
ASSERT(img->Border==0); ASSERT(img->Border==0);
ASSERT(img->TexFormat == MESA_FORMAT_RGB888); ASSERT(img->TexFormat == MESA_FORMAT_RGB888);
ASSERT(img->_IsPowerOfTwo); ASSERT(swImg->_IsPowerOfTwo);
for (k=0; k<n; k++) { for (k=0; k<n; k++) {
GLint i = IFLOOR(texcoords[k][0] * width) & colMask; GLint i = IFLOOR(texcoords[k][0] * width) & colMask;
@@ -1394,6 +1398,7 @@ opt_sample_rgba_2d(struct gl_context *ctx,
const GLfloat lambda[], GLfloat rgba[][4]) const GLfloat lambda[], GLfloat rgba[][4])
{ {
const struct gl_texture_image *img = tObj->Image[0][tObj->BaseLevel]; const struct gl_texture_image *img = tObj->Image[0][tObj->BaseLevel];
const struct swrast_texture_image *swImg = swrast_texture_image_const(img);
const GLfloat width = (GLfloat) img->Width; const GLfloat width = (GLfloat) img->Width;
const GLfloat height = (GLfloat) img->Height; const GLfloat height = (GLfloat) img->Height;
const GLint colMask = img->Width - 1; const GLint colMask = img->Width - 1;
@@ -1406,7 +1411,7 @@ opt_sample_rgba_2d(struct gl_context *ctx,
ASSERT(tObj->Sampler.WrapT==GL_REPEAT); ASSERT(tObj->Sampler.WrapT==GL_REPEAT);
ASSERT(img->Border==0); ASSERT(img->Border==0);
ASSERT(img->TexFormat == MESA_FORMAT_RGBA8888); ASSERT(img->TexFormat == MESA_FORMAT_RGBA8888);
ASSERT(img->_IsPowerOfTwo); ASSERT(swImg->_IsPowerOfTwo);
for (i = 0; i < n; i++) { for (i = 0; i < n; i++) {
const GLint col = IFLOOR(texcoords[i][0] * width) & colMask; const GLint col = IFLOOR(texcoords[i][0] * width) & colMask;
@@ -1429,13 +1434,14 @@ sample_lambda_2d(struct gl_context *ctx,
const GLfloat lambda[], GLfloat rgba[][4]) const GLfloat lambda[], GLfloat rgba[][4])
{ {
const struct gl_texture_image *tImg = tObj->Image[0][tObj->BaseLevel]; const struct gl_texture_image *tImg = tObj->Image[0][tObj->BaseLevel];
const struct swrast_texture_image *swImg = swrast_texture_image_const(tImg);
GLuint minStart, minEnd; /* texels with minification */ GLuint minStart, minEnd; /* texels with minification */
GLuint magStart, magEnd; /* texels with magnification */ GLuint magStart, magEnd; /* texels with magnification */
const GLboolean repeatNoBorderPOT = (tObj->Sampler.WrapS == GL_REPEAT) const GLboolean repeatNoBorderPOT = (tObj->Sampler.WrapS == GL_REPEAT)
&& (tObj->Sampler.WrapT == GL_REPEAT) && (tObj->Sampler.WrapT == GL_REPEAT)
&& (tImg->Border == 0 && (tImg->Width == tImg->RowStride)) && (tImg->Border == 0 && (tImg->Width == tImg->RowStride))
&& tImg->_IsPowerOfTwo; && swImg->_IsPowerOfTwo;
ASSERT(lambda != NULL); ASSERT(lambda != NULL);
compute_min_mag_ranges(tObj, n, lambda, compute_min_mag_ranges(tObj, n, lambda,
@@ -3634,17 +3640,20 @@ _swrast_choose_texture_sample_func( struct gl_context *ctx,
else { else {
/* check for a few optimized cases */ /* check for a few optimized cases */
const struct gl_texture_image *img = t->Image[0][t->BaseLevel]; const struct gl_texture_image *img = t->Image[0][t->BaseLevel];
const struct swrast_texture_image *swImg =
swrast_texture_image_const(img);
ASSERT(t->Sampler.MinFilter == GL_NEAREST); ASSERT(t->Sampler.MinFilter == GL_NEAREST);
if (t->Sampler.WrapS == GL_REPEAT && if (t->Sampler.WrapS == GL_REPEAT &&
t->Sampler.WrapT == GL_REPEAT && t->Sampler.WrapT == GL_REPEAT &&
img->_IsPowerOfTwo && swImg->_IsPowerOfTwo &&
img->Border == 0 && img->Border == 0 &&
img->TexFormat == MESA_FORMAT_RGB888) { img->TexFormat == MESA_FORMAT_RGB888) {
return &opt_sample_rgb_2d; return &opt_sample_rgb_2d;
} }
else if (t->Sampler.WrapS == GL_REPEAT && else if (t->Sampler.WrapS == GL_REPEAT &&
t->Sampler.WrapT == GL_REPEAT && t->Sampler.WrapT == GL_REPEAT &&
img->_IsPowerOfTwo && swImg->_IsPowerOfTwo &&
img->Border == 0 && img->Border == 0 &&
img->TexFormat == MESA_FORMAT_RGBA8888) { img->TexFormat == MESA_FORMAT_RGBA8888) {
return &opt_sample_rgba_2d; return &opt_sample_rgba_2d;

8
src/mesa/swrast/s_texture.c
View File

@@ -67,6 +67,7 @@ _swrast_alloc_texture_image_buffer(struct gl_context *ctx,
gl_format format, GLsizei width, gl_format format, GLsizei width,
GLsizei height, GLsizei depth) GLsizei height, GLsizei depth)
{ {
struct swrast_texture_image *swImg = swrast_texture_image(texImage);
GLuint bytes = _mesa_format_image_size(format, width, height, depth); GLuint bytes = _mesa_format_image_size(format, width, height, depth);
/* This _should_ be true (revisit if these ever fail) */ /* This _should_ be true (revisit if these ever fail) */
@@ -77,6 +78,13 @@ _swrast_alloc_texture_image_buffer(struct gl_context *ctx,
assert(!texImage->Data); assert(!texImage->Data);
texImage->Data = _mesa_align_malloc(bytes, 512); texImage->Data = _mesa_align_malloc(bytes, 512);
if ((width == 1 || _mesa_is_pow_two(texImage->Width2)) &&
(height == 1 || _mesa_is_pow_two(texImage->Height2)) &&
(depth == 1 || _mesa_is_pow_two(texImage->Depth2)))
swImg->_IsPowerOfTwo = GL_TRUE;
else
swImg->_IsPowerOfTwo = GL_FALSE;
return texImage->Data != NULL; return texImage->Data != NULL;
} }

5
src/mesa/swrast/s_triangle.c
View File

@@ -1038,11 +1038,14 @@ _swrast_choose_triangle( struct gl_context *ctx )
/* Ugh, we do a _lot_ of tests to pick the best textured tri func */ /* Ugh, we do a _lot_ of tests to pick the best textured tri func */
const struct gl_texture_object *texObj2D; const struct gl_texture_object *texObj2D;
const struct gl_texture_image *texImg; const struct gl_texture_image *texImg;
const struct swrast_texture_image *swImg;
GLenum minFilter, magFilter, envMode; GLenum minFilter, magFilter, envMode;
gl_format format; gl_format format;
texObj2D = ctx->Texture.Unit[0].CurrentTex[TEXTURE_2D_INDEX]; texObj2D = ctx->Texture.Unit[0].CurrentTex[TEXTURE_2D_INDEX];
texImg = texObj2D ? texObj2D->Image[0][texObj2D->BaseLevel] : NULL; texImg = texObj2D ? texObj2D->Image[0][texObj2D->BaseLevel] : NULL;
swImg = swrast_texture_image_const(texImg);
format = texImg ? texImg->TexFormat : MESA_FORMAT_NONE; format = texImg ? texImg->TexFormat : MESA_FORMAT_NONE;
minFilter = texObj2D ? texObj2D->Sampler.MinFilter : GL_NONE; minFilter = texObj2D ? texObj2D->Sampler.MinFilter : GL_NONE;
magFilter = texObj2D ? texObj2D->Sampler.MagFilter : GL_NONE; magFilter = texObj2D ? texObj2D->Sampler.MagFilter : GL_NONE;
@@ -1057,7 +1060,7 @@ _swrast_choose_triangle( struct gl_context *ctx )
&& texObj2D->Sampler.WrapS == GL_REPEAT && texObj2D->Sampler.WrapS == GL_REPEAT
&& texObj2D->Sampler.WrapT == GL_REPEAT && texObj2D->Sampler.WrapT == GL_REPEAT
&& texObj2D->_Swizzle == SWIZZLE_NOOP && texObj2D->_Swizzle == SWIZZLE_NOOP
&& texImg->_IsPowerOfTwo && swImg->_IsPowerOfTwo
&& texImg->Border == 0 && texImg->Border == 0
&& texImg->Width == texImg->RowStride && texImg->Width == texImg->RowStride
&& (format == MESA_FORMAT_RGB888 || format == MESA_FORMAT_RGBA8888) && (format == MESA_FORMAT_RGB888 || format == MESA_FORMAT_RGBA8888)