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/texcompress_fxt1.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/texcompress_fxt1.c')
| -rw-r--r-- | mesalib/src/mesa/main/texcompress_fxt1.c | 10 |
1 files changed, 2 insertions, 8 deletions
diff --git a/mesalib/src/mesa/main/texcompress_fxt1.c b/mesalib/src/mesa/main/texcompress_fxt1.c index 92af29ad4..eeed78891 100644 --- a/mesalib/src/mesa/main/texcompress_fxt1.c +++ b/mesalib/src/mesa/main/texcompress_fxt1.c @@ -42,15 +42,12 @@ #include "swrast/s_context.h" -#if FEATURE_texture_fxt1 - - static void fxt1_encode (GLuint width, GLuint height, GLint comps, const void *source, GLint srcRowStride, void *dest, GLint destRowStride); -void +static void fxt1_decode_1 (const void *texture, GLint stride, GLint i, GLint j, GLubyte *rgba); @@ -1619,7 +1616,7 @@ fxt1_decode_1ALPHA (const GLubyte *code, GLint t, GLubyte *rgba) } -void +static void fxt1_decode_1 (const void *texture, GLint stride, /* in pixels */ GLint i, GLint j, GLubyte *rgba) { @@ -1646,6 +1643,3 @@ fxt1_decode_1 (const void *texture, GLint stride, /* in pixels */ decode_1[mode](code, t, rgba); } - - -#endif /* FEATURE_texture_fxt1 */ |