Commit 1cf16414 authored by Brian Paul's avatar Brian Paul

gallium: remove unneeded st->bitmap_texcoord_bias

parent 332b77b8
......@@ -355,11 +355,8 @@ setup_bitmap_vertex_data(struct st_context *st,
const GLfloat x1 = x + width;
const GLfloat y0 = y;
const GLfloat y1 = y + height;
const GLfloat bias = 0.0 * st->bitmap_texcoord_bias; /* XXX remove */
const GLfloat xBias = bias / (x1-x0);
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 sLeft = 0.0F, sRight = 1.0F;
const GLfloat tTop = 0.0, tBot = 1.0 - tTop;
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_x1 = x1 / fb_width * 2.0 - 1.0;
......
......@@ -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_x1 = x1 / fb_width * 2.0 - 1.0;
const GLfloat clip_y1 = y1 / fb_height * 2.0 - 1.0;
GLfloat bias = ctx->st->bitmap_texcoord_bias;
GLfloat xBias = 0*bias / (x1-x0);
GLfloat yBias = 0*bias / (y1-y0);
GLfloat sLeft = 0.0 + xBias, sRight = 1.0 + xBias;
GLfloat tTop = invertTex - yBias, tBot = 1.0 - tTop - yBias;
const GLfloat sLeft = 0.0F, sRight = 1.0F;
const GLfloat tTop = invertTex, tBot = 1.0 - tTop;
GLuint tex, i;
/* upper-left */
......
......@@ -123,8 +123,6 @@ struct st_context
GLfloat polygon_offset_scale; /* ?? */
GLfloat bitmap_texcoord_bias;
/** Mapping from VERT_RESULT_x to post-transformed vertex slot */
const GLuint *vertex_result_to_slot;
......
......@@ -109,9 +109,6 @@ void st_init_limits(struct st_context *st)
c->MaxTextureLodBias
= 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
= CLAMP(screen->get_param(screen, PIPE_CAP_MAX_RENDER_TARGETS),
1, MAX_DRAW_BUFFERS);
......@@ -220,11 +217,12 @@ void st_init_extensions(struct st_context *st)
ctx->Extensions.EXT_texture_sRGB = GL_TRUE;
}
#if 01
if (screen->is_format_supported(screen, PIPE_FORMAT_DXT5_RGBA,
PIPE_TEXTURE)) {
ctx->Extensions.EXT_texture_compression_s3tc = GL_TRUE;
}
#endif
if (screen->is_format_supported(screen, PIPE_FORMAT_YCBCR, PIPE_TEXTURE) ||
screen->is_format_supported(screen, PIPE_FORMAT_YCBCR_REV, PIPE_TEXTURE)) {
ctx->Extensions.MESA_ycbcr_texture = GL_TRUE;
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment