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

gallium: remove unneeded st->bitmap_texcoord_bias

Browse Source
This commit is contained in:
Brian Paul
2008-04-25 16:12:11 -06:00
parent 332b77b852
commit 1cf1641427
4 changed files with 6 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/mesa/state_tracker/st_cb_bitmap.c
View File

@@ -355,11 +355,8 @@ setup_bitmap_vertex_data(struct st_context *st,
const GLfloat x1 = x + width; const GLfloat x1 = x + width;
const GLfloat y0 = y; const GLfloat y0 = y;
const GLfloat y1 = y + height; const GLfloat y1 = y + height;
const GLfloat bias = 0.0 * st->bitmap_texcoord_bias; /* XXX remove */ const GLfloat sLeft = 0.0F, sRight = 1.0F;
const GLfloat xBias = bias / (x1-x0); const GLfloat tTop = 0.0, tBot = 1.0 - tTop;
const GLfloat yBias = bias / (y1-y0);
const GLfloat sLeft = 0.0 + xBias, sRight = 1.0 + xBias;
const GLfloat tTop = yBias, tBot = 1.0 - tTop - yBias;
const GLfloat clip_x0 = x0 / fb_width * 2.0 - 1.0; const GLfloat clip_x0 = x0 / fb_width * 2.0 - 1.0;
const GLfloat clip_y0 = y0 / fb_height * 2.0 - 1.0; const GLfloat clip_y0 = y0 / fb_height * 2.0 - 1.0;
const GLfloat clip_x1 = x1 / fb_width * 2.0 - 1.0; const GLfloat clip_x1 = x1 / fb_width * 2.0 - 1.0;

7
src/mesa/state_tracker/st_cb_drawpixels.c
View File

@@ -425,11 +425,8 @@ draw_quad(GLcontext *ctx, GLfloat x0, GLfloat y0, GLfloat z,
const GLfloat clip_y0 = y0 / fb_height * 2.0 - 1.0; const GLfloat clip_y0 = y0 / fb_height * 2.0 - 1.0;
const GLfloat clip_x1 = x1 / fb_width * 2.0 - 1.0; const GLfloat clip_x1 = x1 / fb_width * 2.0 - 1.0;
const GLfloat clip_y1 = y1 / fb_height * 2.0 - 1.0; const GLfloat clip_y1 = y1 / fb_height * 2.0 - 1.0;
GLfloat bias = ctx->st->bitmap_texcoord_bias; const GLfloat sLeft = 0.0F, sRight = 1.0F;
GLfloat xBias = 0*bias / (x1-x0); const GLfloat tTop = invertTex, tBot = 1.0 - tTop;
GLfloat yBias = 0*bias / (y1-y0);
GLfloat sLeft = 0.0 + xBias, sRight = 1.0 + xBias;
GLfloat tTop = invertTex - yBias, tBot = 1.0 - tTop - yBias;
GLuint tex, i; GLuint tex, i;
/* upper-left */ /* upper-left */

2
src/mesa/state_tracker/st_context.h
View File

@@ -123,8 +123,6 @@ struct st_context
GLfloat polygon_offset_scale; /* ?? */ GLfloat polygon_offset_scale; /* ?? */
GLfloat bitmap_texcoord_bias;
/** Mapping from VERT_RESULT_x to post-transformed vertex slot */ /** Mapping from VERT_RESULT_x to post-transformed vertex slot */
const GLuint *vertex_result_to_slot; const GLuint *vertex_result_to_slot;

6
src/mesa/state_tracker/st_extensions.c
View File

@@ -109,9 +109,6 @@ void st_init_limits(struct st_context *st)
c->MaxTextureLodBias c->MaxTextureLodBias
= screen->get_paramf(screen, PIPE_CAP_MAX_TEXTURE_LOD_BIAS); = screen->get_paramf(screen, PIPE_CAP_MAX_TEXTURE_LOD_BIAS);
st->bitmap_texcoord_bias
= screen->get_paramf(screen, PIPE_CAP_BITMAP_TEXCOORD_BIAS);
c->MaxDrawBuffers c->MaxDrawBuffers
= CLAMP(screen->get_param(screen, PIPE_CAP_MAX_RENDER_TARGETS), = CLAMP(screen->get_param(screen, PIPE_CAP_MAX_RENDER_TARGETS),
1, MAX_DRAW_BUFFERS); 1, MAX_DRAW_BUFFERS);
@@ -220,11 +217,12 @@ void st_init_extensions(struct st_context *st)
ctx->Extensions.EXT_texture_sRGB = GL_TRUE; ctx->Extensions.EXT_texture_sRGB = GL_TRUE;
} }
#if 01
if (screen->is_format_supported(screen, PIPE_FORMAT_DXT5_RGBA, if (screen->is_format_supported(screen, PIPE_FORMAT_DXT5_RGBA,
PIPE_TEXTURE)) { PIPE_TEXTURE)) {
ctx->Extensions.EXT_texture_compression_s3tc = GL_TRUE; ctx->Extensions.EXT_texture_compression_s3tc = GL_TRUE;
} }
#endif
if (screen->is_format_supported(screen, PIPE_FORMAT_YCBCR, PIPE_TEXTURE) || if (screen->is_format_supported(screen, PIPE_FORMAT_YCBCR, PIPE_TEXTURE) ||
screen->is_format_supported(screen, PIPE_FORMAT_YCBCR_REV, PIPE_TEXTURE)) { screen->is_format_supported(screen, PIPE_FORMAT_YCBCR_REV, PIPE_TEXTURE)) {
ctx->Extensions.MESA_ycbcr_texture = GL_TRUE; ctx->Extensions.MESA_ycbcr_texture = GL_TRUE;