4 files changed, 6 insertions, 16 deletions
diff --git a/src/mesa/state_tracker/st_cb_bitmap.c b/src/mesa/state_tracker/st_cb_bitmap.c
index 507ace27c71..6c2d9a4b897 100644
--- a/src/mesa/state_tracker/st_cb_bitmap.c
+++ b/src/mesa/state_tracker/st_cb_bitmap.c
@@ -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;
diff --git a/src/mesa/state_tracker/st_cb_drawpixels.c b/src/mesa/state_tracker/st_cb_drawpixels.c
index cdfa041d15f..047ea3816bc 100644
--- a/src/mesa/state_tracker/st_cb_drawpixels.c
+++ b/src/mesa/state_tracker/st_cb_drawpixels.c
@@ -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 */
diff --git a/src/mesa/state_tracker/st_context.h b/src/mesa/state_tracker/st_context.h
index 7e933a2b109..80a71d17667 100644
--- a/src/mesa/state_tracker/st_context.h
+++ b/src/mesa/state_tracker/st_context.h
@@ -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;
 
diff --git a/src/mesa/state_tracker/st_extensions.c b/src/mesa/state_tracker/st_extensions.c
index f2d40e84b3c..260a2efe886 100644
--- a/src/mesa/state_tracker/st_extensions.c
+++ b/src/mesa/state_tracker/st_extensions.c
@@ -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;