diff options
author | marha <marha@users.sourceforge.net> | 2012-09-17 16:16:11 +0200 |
---|---|---|
committer | marha <marha@users.sourceforge.net> | 2012-09-17 16:16:11 +0200 |
commit | c72f683c50e774b21967f0121245a286539fa555 (patch) | |
tree | fa5e86f04a33b8bcebf937d1966052ccf1fefbeb /mesalib/src/mesa/main/drawtex.c | |
parent | 86fb7e4a298199b30bd16565569a9b3dfe7a1f11 (diff) | |
parent | e3c4aa34268f99562e66b43a7d9efcd16ca072e6 (diff) | |
download | vcxsrv-c72f683c50e774b21967f0121245a286539fa555.tar.gz vcxsrv-c72f683c50e774b21967f0121245a286539fa555.tar.bz2 vcxsrv-c72f683c50e774b21967f0121245a286539fa555.zip |
Merge remote-tracking branch 'origin/released'
Conflicts:
mesalib/src/mesa/main/syncobj.h
pixman/pixman/pixman-mmx.c
Diffstat (limited to 'mesalib/src/mesa/main/drawtex.c')
-rw-r--r-- | mesalib/src/mesa/main/drawtex.c | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/mesalib/src/mesa/main/drawtex.c b/mesalib/src/mesa/main/drawtex.c index 83485a928..d5cac22bd 100644 --- a/mesalib/src/mesa/main/drawtex.c +++ b/mesalib/src/mesa/main/drawtex.c @@ -28,9 +28,6 @@ #include "main/mtypes.h" -#if FEATURE_OES_draw_texture - - static void draw_texture(struct gl_context *ctx, GLfloat x, GLfloat y, GLfloat z, GLfloat width, GLfloat height) @@ -133,5 +130,3 @@ _mesa_DrawTexxv(const GLfixed *coords) (GLfloat) coords[3] / 65536.0f, (GLfloat) coords[4] / 65536.0f); } - -#endif /* FEATURE_OES_draw_texture */ |