OpenHarmony/third_party_mesa3d
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

meta: fix assorted MSVC int/float conversion warnings

Browse Source
This commit is contained in:
Brian Paul
2013-10-29 14:10:11 -06:00
parent e4d4ec9ddf
commit 010f8762e8
1 changed files with 14 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
src/mesa/drivers/common/meta.c
View File

@@ -1729,10 +1729,10 @@ blitframebuffer_texture(struct gl_context *ctx,
}
else {
assert(target == GL_TEXTURE_RECTANGLE_ARB);
s0 = srcX0;
s1 = srcX1;
t0 = srcY0;
t1 = srcY1;
s0 = (float) srcX0;
s1 = (float) srcX1;
t0 = (float) srcY0;
t1 = (float) srcY1;
}
/* setup vertex positions */
@@ -2825,7 +2825,7 @@ _mesa_meta_DrawPixels(struct gl_context *ctx,
_mesa_StencilMask(mask);
_mesa_ProgramLocalParameter4fARB(GL_FRAGMENT_PROGRAM_ARB, 0,
255.0 / mask, 0.5, 0.0, 0.0);
255.0f / mask, 0.5f, 0.0f, 0.0f);
_mesa_DrawArrays(GL_TRIANGLE_FAN, 0, 4);
}
@@ -3184,7 +3184,7 @@ setup_texture_coords(GLenum faceTarget,
r = (slice + 0.5f) / depth;
}
else if (faceTarget == GL_TEXTURE_2D_ARRAY)
r = slice;
r = (float) slice;
else
r = 0.0F;
coords0[0] = 0.0F; /* s */
@@ -3204,28 +3204,28 @@ setup_texture_coords(GLenum faceTarget,
coords0[0] = 0.0F; /* s */
coords0[1] = 0.0F; /* t */
coords0[2] = 0.0F; /* r */
coords1[0] = width;
coords1[0] = (float) width;
coords1[1] = 0.0F;
coords1[2] = 0.0F;
coords2[0] = width;
coords2[1] = height;
coords2[0] = (float) width;
coords2[1] = (float) height;
coords2[2] = 0.0F;
coords3[0] = 0.0F;
coords3[1] = height;
coords3[1] = (float) height;
coords3[2] = 0.0F;
break;
case GL_TEXTURE_1D_ARRAY:
coords0[0] = 0.0F; /* s */
coords0[1] = slice; /* t */
coords0[1] = (float) slice; /* t */
coords0[2] = 0.0F; /* r */
coords1[0] = 1.0f;
coords1[1] = slice;
coords1[1] = (float) slice;
coords1[2] = 0.0F;
coords2[0] = 1.0F;
coords2[1] = slice;
coords2[1] = (float) slice;
coords2[2] = 0.0F;
coords3[0] = 0.0F;
coords3[1] = slice;
coords3[1] = (float) slice;
coords3[2] = 0.0F;
break;