diff options
| author | marha <marha@users.sourceforge.net> | 2012-07-11 12:00:44 +0200 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2012-07-11 12:00:44 +0200 |
| commit | db967c2b0fd8506b9e1cf7574d5fb927bec786c5 (patch) | |
| tree | 5444de1e304af7b5ae8c4b590a08b1b5964c7eca /mesalib/src/mesa/main/texcompress_etc.h | |
| parent | 6cab6b3ebc8ed1a81ced93d621ea3abf05e282ab (diff) | |
| parent | 0bef135026040688be97af98cc99cc82f93838e8 (diff) | |
| download | vcxsrv-db967c2b0fd8506b9e1cf7574d5fb927bec786c5.tar.gz vcxsrv-db967c2b0fd8506b9e1cf7574d5fb927bec786c5.tar.bz2 vcxsrv-db967c2b0fd8506b9e1cf7574d5fb927bec786c5.zip | |
Merge remote-tracking branch 'origin/released'
Conflicts:
xorg-server/dix/devices.c
Diffstat (limited to 'mesalib/src/mesa/main/texcompress_etc.h')
| -rw-r--r-- | mesalib/src/mesa/main/texcompress_etc.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/mesalib/src/mesa/main/texcompress_etc.h b/mesalib/src/mesa/main/texcompress_etc.h index 4e166b2b1..8e8427f8f 100644 --- a/mesalib/src/mesa/main/texcompress_etc.h +++ b/mesalib/src/mesa/main/texcompress_etc.h @@ -30,10 +30,10 @@ struct swrast_texture_image; -extern GLboolean +GLboolean _mesa_texstore_etc1_rgb8(TEXSTORE_PARAMS); -extern void +void _mesa_fetch_texel_2d_f_etc1_rgb8(const struct swrast_texture_image *texImage, GLint i, GLint j, GLint k, GLfloat *texel); |