diff options
| author | marha <marha@users.sourceforge.net> | 2012-11-19 11:21:45 +0100 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2012-11-19 11:21:45 +0100 |
| commit | 57b3e446b9b4017ccfdd3227be481df590740426 (patch) | |
| tree | 0e4899f530f75d343c090202fc7123c78f9b4866 /mesalib/src/mesa/main/drawtex.c | |
| parent | 24635abae6008bef13e30d798b3f33abab412770 (diff) | |
| parent | b3e1e62c45f525cdd332073aaa34d8452cb23374 (diff) | |
| download | vcxsrv-57b3e446b9b4017ccfdd3227be481df590740426.tar.gz vcxsrv-57b3e446b9b4017ccfdd3227be481df590740426.tar.bz2 vcxsrv-57b3e446b9b4017ccfdd3227be481df590740426.zip | |
Merge remote-tracking branch 'origin/released'
* origin/released:
git update 19 nov 2012
Added bash script to update released branch
Conflicts:
mesalib/src/mapi/glapi/gen/gl_API.xml
mesalib/src/mesa/program/.gitignore
pixman/pixman/pixman-mmx.c
xorg-server/Xi/xiquerypointer.c
xorg-server/xkb/xkb.c
Diffstat (limited to 'mesalib/src/mesa/main/drawtex.c')
| -rw-r--r-- | mesalib/src/mesa/main/drawtex.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/mesalib/src/mesa/main/drawtex.c b/mesalib/src/mesa/main/drawtex.c index d5cac22bd..7285805c8 100644 --- a/mesalib/src/mesa/main/drawtex.c +++ b/mesalib/src/mesa/main/drawtex.c @@ -55,7 +55,7 @@ draw_texture(struct gl_context *ctx, GLfloat x, GLfloat y, GLfloat z, void GLAPIENTRY -_mesa_DrawTexf(GLfloat x, GLfloat y, GLfloat z, GLfloat width, GLfloat height) +_mesa_DrawTexfOES(GLfloat x, GLfloat y, GLfloat z, GLfloat width, GLfloat height) { GET_CURRENT_CONTEXT(ctx); draw_texture(ctx, x, y, z, width, height); @@ -63,7 +63,7 @@ _mesa_DrawTexf(GLfloat x, GLfloat y, GLfloat z, GLfloat width, GLfloat height) void GLAPIENTRY -_mesa_DrawTexfv(const GLfloat *coords) +_mesa_DrawTexfvOES(const GLfloat *coords) { GET_CURRENT_CONTEXT(ctx); draw_texture(ctx, coords[0], coords[1], coords[2], coords[3], coords[4]); @@ -71,7 +71,7 @@ _mesa_DrawTexfv(const GLfloat *coords) void GLAPIENTRY -_mesa_DrawTexi(GLint x, GLint y, GLint z, GLint width, GLint height) +_mesa_DrawTexiOES(GLint x, GLint y, GLint z, GLint width, GLint height) { GET_CURRENT_CONTEXT(ctx); draw_texture(ctx, (GLfloat) x, (GLfloat) y, (GLfloat) z, @@ -80,7 +80,7 @@ _mesa_DrawTexi(GLint x, GLint y, GLint z, GLint width, GLint height) void GLAPIENTRY -_mesa_DrawTexiv(const GLint *coords) +_mesa_DrawTexivOES(const GLint *coords) { GET_CURRENT_CONTEXT(ctx); draw_texture(ctx, (GLfloat) coords[0], (GLfloat) coords[1], @@ -89,7 +89,7 @@ _mesa_DrawTexiv(const GLint *coords) void GLAPIENTRY -_mesa_DrawTexs(GLshort x, GLshort y, GLshort z, GLshort width, GLshort height) +_mesa_DrawTexsOES(GLshort x, GLshort y, GLshort z, GLshort width, GLshort height) { GET_CURRENT_CONTEXT(ctx); draw_texture(ctx, (GLfloat) x, (GLfloat) y, (GLfloat) z, @@ -98,7 +98,7 @@ _mesa_DrawTexs(GLshort x, GLshort y, GLshort z, GLshort width, GLshort height) void GLAPIENTRY -_mesa_DrawTexsv(const GLshort *coords) +_mesa_DrawTexsvOES(const GLshort *coords) { GET_CURRENT_CONTEXT(ctx); draw_texture(ctx, (GLfloat) coords[0], (GLfloat) coords[1], |