diff options
author | marha <marha@users.sourceforge.net> | 2014-09-08 23:27:52 +0200 |
---|---|---|
committer | marha <marha@users.sourceforge.net> | 2014-09-08 23:27:52 +0200 |
commit | cb346e228aeb500cd61ec86644c034c238332d3b (patch) | |
tree | 5902a043a3643391e689ebb146e6fd02af1c4b8e /mesalib/src/mesa/swrast | |
parent | 4aef26e36bc9aba4cd67c158e17f5fb93c9e018c (diff) | |
download | vcxsrv-cb346e228aeb500cd61ec86644c034c238332d3b.tar.gz vcxsrv-cb346e228aeb500cd61ec86644c034c238332d3b.tar.bz2 vcxsrv-cb346e228aeb500cd61ec86644c034c238332d3b.zip |
xkeyboard-config mesa git update 8 Sep 2014
xkeyboard-config commit 1b9901151cdb22e413319e6fca80fbbfc5e51502
mesa commit 12fb74fe895fe9954df127ca0ec6e4422fffb156
Diffstat (limited to 'mesalib/src/mesa/swrast')
-rw-r--r-- | mesalib/src/mesa/swrast/s_texfilter.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/mesalib/src/mesa/swrast/s_texfilter.c b/mesalib/src/mesa/swrast/s_texfilter.c index c3fd900b4..65cf52e21 100644 --- a/mesalib/src/mesa/swrast/s_texfilter.c +++ b/mesalib/src/mesa/swrast/s_texfilter.c @@ -804,7 +804,7 @@ get_border_color(const struct gl_sampler_object *samp, /** * Put z into texel according to GL_DEPTH_MODE. */ -static INLINE void +static inline void apply_depth_mode(GLenum depthMode, GLfloat z, GLfloat texel[4]) { switch (depthMode) { |