From f242823b12626bde37280a2f8ae48b5d6cf93580 Mon Sep 17 00:00:00 2001 From: Ansariel Date: Sun, 5 Mar 2017 16:45:20 +0100 Subject: [PATCH] Skip some avoidable conversions --- indra/newview/llbox.cpp | 12 ++++++------ indra/newview/llvoavatar.cpp | 12 ++++++------ indra/newview/pipeline.cpp | 12 ++++++------ 3 files changed, 18 insertions(+), 18 deletions(-) diff --git a/indra/newview/llbox.cpp b/indra/newview/llbox.cpp index 4caeb7e13d..128fbdf42e 100644 --- a/indra/newview/llbox.cpp +++ b/indra/newview/llbox.cpp @@ -91,18 +91,18 @@ void LLBox::renderface(S32 which_face) gGL.begin(LLRender::TRIANGLES); { //gGL.normal3fv(&normals[which_face][0]); - gGL.texCoord2f(1, 0); + gGL.texCoord2f(1.f, 0.f); gGL.vertex3fv(&mVertex[ faces[which_face][0] ][0]); - gGL.texCoord2f(1, 1); + gGL.texCoord2f(1.f, 1.f); gGL.vertex3fv(&mVertex[ faces[which_face][1] ][0]); - gGL.texCoord2f(0, 1); + gGL.texCoord2f(0.f, 1.f); gGL.vertex3fv(&mVertex[ faces[which_face][2] ][0]); - gGL.texCoord2f(0, 1); + gGL.texCoord2f(0.f, 1.f); gGL.vertex3fv(&mVertex[ faces[which_face][2] ][0]); - gGL.texCoord2f(1, 0); + gGL.texCoord2f(1.f, 0.f); gGL.vertex3fv(&mVertex[ faces[which_face][0] ][0]); - gGL.texCoord2f(0, 0); + gGL.texCoord2f(0.f, 0.f); gGL.vertex3fv(&mVertex[ faces[which_face][3] ][0]); } gGL.end(); diff --git a/indra/newview/llvoavatar.cpp b/indra/newview/llvoavatar.cpp index c7953472ae..6cac25de86 100644 --- a/indra/newview/llvoavatar.cpp +++ b/indra/newview/llvoavatar.cpp @@ -5090,18 +5090,18 @@ U32 LLVOAvatar::renderImpostor(LLColor4U color, S32 diffuse_channel) //gGL.end(); gGL.begin(LLRender::TRIANGLES); { - gGL.texCoord2f(0, 0); + gGL.texCoord2f(0.f, 0.f); gGL.vertex3fv((pos + left - up).mV); - gGL.texCoord2f(1, 0); + gGL.texCoord2f(1.f, 0.f); gGL.vertex3fv((pos - left - up).mV); - gGL.texCoord2f(1, 1); + gGL.texCoord2f(1.f, 1.f); gGL.vertex3fv((pos - left + up).mV); - gGL.texCoord2f(1, 1); + gGL.texCoord2f(1.f, 1.f); gGL.vertex3fv((pos - left + up).mV); - gGL.texCoord2f(0, 0); + gGL.texCoord2f(0.f, 0.f); gGL.vertex3fv((pos + left - up).mV); - gGL.texCoord2f(0, 1); + gGL.texCoord2f(0.f, 1.f); gGL.vertex3fv((pos + left + up).mV); } gGL.end(); diff --git a/indra/newview/pipeline.cpp b/indra/newview/pipeline.cpp index 562fe21b19..07059bd740 100644 --- a/indra/newview/pipeline.cpp +++ b/indra/newview/pipeline.cpp @@ -11719,13 +11719,13 @@ void LLPipeline::generateImpostor(LLVOAvatar* avatar) //gGL.end(); gGL.begin(LLRender::TRIANGLES); { - gGL.vertex3f(-1, -1, clip_plane); - gGL.vertex3f(1, -1, clip_plane); - gGL.vertex3f(1, 1, clip_plane); + gGL.vertex3f(-1.f, -1.f, clip_plane); + gGL.vertex3f(1.f, -1.f, clip_plane); + gGL.vertex3f(1.f, 1.f, clip_plane); - gGL.vertex3f(1, 1, clip_plane); - gGL.vertex3f(-1, -1, clip_plane); - gGL.vertex3f(-1, 1, clip_plane); + gGL.vertex3f(1.f, 1.f, clip_plane); + gGL.vertex3f(-1.f, -1.f, clip_plane); + gGL.vertex3f(-1.f, 1.f, clip_plane); } gGL.end(); //