diff options
| author | Chia-I Wu <olvaffe@gmail.com> | 2009-09-23 14:45:37 +0800 |
|---|---|---|
| committer | Chia-I Wu <olvaffe@gmail.com> | 2009-09-23 14:45:37 +0800 |
| commit | 1ba61c244fe2759ddc0c60e9cabf2b9dbe2544ce (patch) | |
| tree | f880e160d503efcf7be5ec9ac19f6163999352f1 | |
| parent | 6059e6a8f25e15e934a268d1f022044736f8ba33 (diff) | |
| parent | dce62509e5d3f7fb8c5890fac51ec2d218c15960 (diff) | |
Merge branch 'mesa-es' into android
| -rw-r--r-- | src/mesa/drivers/common/meta.c | 13 | ||||
| -rw-r--r-- | src/mesa/es/main/specials_es1.c | 3 |
2 files changed, 7 insertions, 9 deletions
diff --git a/src/mesa/drivers/common/meta.c b/src/mesa/drivers/common/meta.c index 5c794ee443..896e258712 100644 --- a/src/mesa/drivers/common/meta.c +++ b/src/mesa/drivers/common/meta.c @@ -2061,7 +2061,7 @@ _mesa_meta_generate_mipmap(GLcontext *ctx, GLenum target, /** * Meta implementation of ctx->Driver.DrawTex() in terms - * of texture mapping and polygon rendering. + * of polygon rendering. */ void _mesa_meta_draw_tex(GLcontext *ctx, GLfloat x, GLfloat y, GLfloat z, @@ -2072,16 +2072,13 @@ _mesa_meta_draw_tex(GLcontext *ctx, GLfloat x, GLfloat y, GLfloat z, GLfloat x, y, z, st[MAX_TEXTURE_UNITS][2]; }; struct vertex verts[4]; - GLboolean vp_enabled; GLuint i; _mesa_meta_begin(ctx, (META_RASTERIZATION | + META_SHADER | META_TRANSFORM | META_VERTEX | META_VIEWPORT)); - vp_enabled = ctx->VertexProgram.Enabled; - if (vp_enabled) - _mesa_set_enable(ctx, GL_VERTEX_PROGRAM_ARB, GL_FALSE); if (drawtex->ArrayObj == 0) { /* one-time setup */ @@ -2112,8 +2109,8 @@ _mesa_meta_draw_tex(GLcontext *ctx, GLfloat x, GLfloat y, GLfloat z, /* vertex positions, texcoords */ { - const GLfloat x1 = x + width * ctx->Pixel.ZoomX; - const GLfloat y1 = y + height * ctx->Pixel.ZoomY; + const GLfloat x1 = x + width; + const GLfloat y1 = y + height; verts[0].x = x; verts[0].y = y; @@ -2174,8 +2171,6 @@ _mesa_meta_draw_tex(GLcontext *ctx, GLfloat x, GLfloat y, GLfloat z, _mesa_DrawArrays(GL_TRIANGLE_FAN, 0, 4); - if (vp_enabled) - _mesa_set_enable(ctx, GL_VERTEX_PROGRAM_ARB, GL_TRUE); _mesa_meta_end(ctx); } diff --git a/src/mesa/es/main/specials_es1.c b/src/mesa/es/main/specials_es1.c index 1de2cdd3cd..e57b7f7025 100644 --- a/src/mesa/es/main/specials_es1.c +++ b/src/mesa/es/main/specials_es1.c @@ -138,6 +138,9 @@ make_extension_string(const GLcontext *ctx, char *str) if (ctx->Extensions.EXT_texture_filter_anisotropic) len += append_extension(&str, "GL_EXT_texture_filter_anisotropic"); + if (ctx->Extensions.ARB_texture_non_power_of_two) + len += append_extension(&str, "GL_ARB_texture_non_power_of_two"); + return len; } |