OSDN Git Service
(root)
/
android-x86
/
external-mesa.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
6bf7d40
)
meta: add some 'f' suffixes to silence MSVC warnings
author
Brian Paul
<brianp@vmware.com>
Sat, 7 Jan 2012 21:16:27 +0000
(14:16 -0700)
committer
Brian Paul
<brianp@vmware.com>
Sat, 7 Jan 2012 21:16:27 +0000
(14:16 -0700)
src/mesa/drivers/common/meta.c
patch
|
blob
|
history
diff --git
a/src/mesa/drivers/common/meta.c
b/src/mesa/drivers/common/meta.c
index
785a595
..
d8a2591
100644
(file)
--- a/
src/mesa/drivers/common/meta.c
+++ b/
src/mesa/drivers/common/meta.c
@@
-1026,7
+1026,7
@@
_mesa_meta_in_progress(struct gl_context *ctx)
static INLINE GLfloat
invert_z(GLfloat normZ)
{
- GLfloat objZ = 1.0
- 2.0
* normZ;
+ GLfloat objZ = 1.0
f - 2.0f
* normZ;
return objZ;
}
@@
-2920,7
+2920,7
@@
_mesa_meta_GenerateMipmap(struct gl_context *ctx, GLenum target,
/* setup texcoords (XXX what about border?) */
setup_texture_coords(faceTarget,
- 0.0
, 0.0
, /* width, height never used here */
+ 0.0
f, 0.0f
, /* width, height never used here */
slice,
verts[0].tex,
verts[1].tex,