BUILDFIX: fixed llviewerassetstats test and render2dutils changes

that were dropped in merge

1 files changed, 109 insertions, 109 deletions

diff --git a/indra/llrender/llrender2dutils.cpp b/indra/llrender/llrender2dutils.cpp
index 9d23a64e4c..fe34c218a8 100644
--- a/indra/llrender/llrender2dutils.cpp
+++ b/indra/llrender/llrender2dutils.cpp
@@ -354,10 +354,10 @@ void gl_draw_image( S32 x, S32 y, LLTexture* image, const LLColor4& color, const
 	gl_draw_scaled_rotated_image( x, y, image->getWidth(0), image->getHeight(0), 0.f, image, color, uv_rect );
 }
 
-void gl_draw_scaled_target(S32 x, S32 y, S32 width, S32 height, LLRenderTarget* target, const LLColor4& color, const LLRectf& uv_rect)

-{

-	gl_draw_scaled_rotated_image(x, y, width, height, 0.f, NULL, color, uv_rect, target);

-}

+void gl_draw_scaled_target(S32 x, S32 y, S32 width, S32 height, LLRenderTarget* target, const LLColor4& color, const LLRectf& uv_rect)
+{
+	gl_draw_scaled_rotated_image(x, y, width, height, 0.f, NULL, color, uv_rect, target);
+}
 
 void gl_draw_scaled_image(S32 x, S32 y, S32 width, S32 height, LLTexture* image, const LLColor4& color, const LLRectf& uv_rect)
 {
@@ -645,111 +645,111 @@ void gl_draw_rotated_image(S32 x, S32 y, F32 degrees, LLTexture* image, const LL
 	gl_draw_scaled_rotated_image( x, y, image->getWidth(0), image->getHeight(0), degrees, image, color, uv_rect );
 }
 
-void gl_draw_scaled_rotated_image(S32 x, S32 y, S32 width, S32 height, F32 degrees, LLTexture* image, const LLColor4& color, const LLRectf& uv_rect, LLRenderTarget* target)

-{

-	if (!image && !target)

-	{

-		llwarns << "image == NULL; aborting function" << llendl;

-		return;

-	}

-

-	LLGLSUIDefault gls_ui;

-

-	if(image != NULL)

-	{

-		gGL.getTexUnit(0)->bind(image, true);

-	}

-	else

-	{

-		gGL.getTexUnit(0)->bind(target);

-	}

-

-	gGL.color4fv(color.mV);

-

-	if (degrees == 0.f)

-	{

-		const S32 NUM_VERTICES = 4; // 9 quads

-		LLVector2 uv[NUM_VERTICES];

-		LLVector3 pos[NUM_VERTICES];

-

-		gGL.begin(LLRender::QUADS);

-		{

-			LLVector3 ui_scale = gGL.getUIScale();

-			LLVector3 ui_translation = gGL.getUITranslation();

-			ui_translation.mV[VX] += x;

-			ui_translation.mV[VY] += y;

-			ui_translation.scaleVec(ui_scale);

-			S32 index = 0;

-			S32 scaled_width = llround(width * ui_scale.mV[VX]);

-			S32 scaled_height = llround(height * ui_scale.mV[VY]);

-

-			uv[index] = LLVector2(uv_rect.mRight, uv_rect.mTop);

-			pos[index] = LLVector3(ui_translation.mV[VX] + scaled_width, ui_translation.mV[VY] + scaled_height, 0.f);

-			index++;

-

-			uv[index] = LLVector2(uv_rect.mLeft, uv_rect.mTop);

-			pos[index] = LLVector3(ui_translation.mV[VX], ui_translation.mV[VY] + scaled_height, 0.f);

-			index++;

-

-			uv[index] = LLVector2(uv_rect.mLeft, uv_rect.mBottom);

-			pos[index] = LLVector3(ui_translation.mV[VX], ui_translation.mV[VY], 0.f);

-			index++;

-

-			uv[index] = LLVector2(uv_rect.mRight, uv_rect.mBottom);

-			pos[index] = LLVector3(ui_translation.mV[VX] + scaled_width, ui_translation.mV[VY], 0.f);

-			index++;

-

-			gGL.vertexBatchPreTransformed(pos, uv, NUM_VERTICES);

-		}

-		gGL.end();

-	}

-	else

-	{

-		gGL.pushUIMatrix();

-		gGL.translateUI((F32)x, (F32)y, 0.f);

-

-		F32 offset_x = F32(width/2);

-		F32 offset_y = F32(height/2);

-

-		gGL.translateUI(offset_x, offset_y, 0.f);

-

-		LLMatrix3 quat(0.f, 0.f, degrees*DEG_TO_RAD);

-

-		if(image != NULL)

-		{

-			gGL.getTexUnit(0)->bind(image, true);

-		}

-		else

-		{

-			gGL.getTexUnit(0)->bind(target);

-		}

-

-		gGL.color4fv(color.mV);

-

-		gGL.begin(LLRender::QUADS);

-		{

-			LLVector3 v;

-

-			v = LLVector3(offset_x, offset_y, 0.f) * quat;

-			gGL.texCoord2f(uv_rect.mRight, uv_rect.mTop);

-			gGL.vertex2f(v.mV[0], v.mV[1] );

-

-			v = LLVector3(-offset_x, offset_y, 0.f) * quat;

-			gGL.texCoord2f(uv_rect.mLeft, uv_rect.mTop);

-			gGL.vertex2f(v.mV[0], v.mV[1] );

-

-			v = LLVector3(-offset_x, -offset_y, 0.f) * quat;

-			gGL.texCoord2f(uv_rect.mLeft, uv_rect.mBottom);

-			gGL.vertex2f(v.mV[0], v.mV[1] );

-

-			v = LLVector3(offset_x, -offset_y, 0.f) * quat;

-			gGL.texCoord2f(uv_rect.mRight, uv_rect.mBottom);

-			gGL.vertex2f(v.mV[0], v.mV[1] );

-		}

-		gGL.end();

-		gGL.popUIMatrix();

-	}

-}

+void gl_draw_scaled_rotated_image(S32 x, S32 y, S32 width, S32 height, F32 degrees, LLTexture* image, const LLColor4& color, const LLRectf& uv_rect, LLRenderTarget* target)
+{
+	if (!image && !target)
+	{
+		llwarns << "image == NULL; aborting function" << llendl;
+		return;
+	}
+
+	LLGLSUIDefault gls_ui;
+
+	if(image != NULL)
+	{
+		gGL.getTexUnit(0)->bind(image, true);
+	}
+	else
+	{
+		gGL.getTexUnit(0)->bind(target);
+	}
+
+	gGL.color4fv(color.mV);
+
+	if (degrees == 0.f)
+	{
+		const S32 NUM_VERTICES = 4; // 9 quads
+		LLVector2 uv[NUM_VERTICES];
+		LLVector3 pos[NUM_VERTICES];
+
+		gGL.begin(LLRender::QUADS);
+		{
+			LLVector3 ui_scale = gGL.getUIScale();
+			LLVector3 ui_translation = gGL.getUITranslation();
+			ui_translation.mV[VX] += x;
+			ui_translation.mV[VY] += y;
+			ui_translation.scaleVec(ui_scale);
+			S32 index = 0;
+			S32 scaled_width = llround(width * ui_scale.mV[VX]);
+			S32 scaled_height = llround(height * ui_scale.mV[VY]);
+
+			uv[index] = LLVector2(uv_rect.mRight, uv_rect.mTop);
+			pos[index] = LLVector3(ui_translation.mV[VX] + scaled_width, ui_translation.mV[VY] + scaled_height, 0.f);
+			index++;
+
+			uv[index] = LLVector2(uv_rect.mLeft, uv_rect.mTop);
+			pos[index] = LLVector3(ui_translation.mV[VX], ui_translation.mV[VY] + scaled_height, 0.f);
+			index++;
+
+			uv[index] = LLVector2(uv_rect.mLeft, uv_rect.mBottom);
+			pos[index] = LLVector3(ui_translation.mV[VX], ui_translation.mV[VY], 0.f);
+			index++;
+
+			uv[index] = LLVector2(uv_rect.mRight, uv_rect.mBottom);
+			pos[index] = LLVector3(ui_translation.mV[VX] + scaled_width, ui_translation.mV[VY], 0.f);
+			index++;
+
+			gGL.vertexBatchPreTransformed(pos, uv, NUM_VERTICES);
+		}
+		gGL.end();
+	}
+	else
+	{
+		gGL.pushUIMatrix();
+		gGL.translateUI((F32)x, (F32)y, 0.f);
+
+		F32 offset_x = F32(width/2);
+		F32 offset_y = F32(height/2);
+
+		gGL.translateUI(offset_x, offset_y, 0.f);
+
+		LLMatrix3 quat(0.f, 0.f, degrees*DEG_TO_RAD);
+
+		if(image != NULL)
+		{
+			gGL.getTexUnit(0)->bind(image, true);
+		}
+		else
+		{
+			gGL.getTexUnit(0)->bind(target);
+		}
+
+		gGL.color4fv(color.mV);
+
+		gGL.begin(LLRender::QUADS);
+		{
+			LLVector3 v;
+
+			v = LLVector3(offset_x, offset_y, 0.f) * quat;
+			gGL.texCoord2f(uv_rect.mRight, uv_rect.mTop);
+			gGL.vertex2f(v.mV[0], v.mV[1] );
+
+			v = LLVector3(-offset_x, offset_y, 0.f) * quat;
+			gGL.texCoord2f(uv_rect.mLeft, uv_rect.mTop);
+			gGL.vertex2f(v.mV[0], v.mV[1] );
+
+			v = LLVector3(-offset_x, -offset_y, 0.f) * quat;
+			gGL.texCoord2f(uv_rect.mLeft, uv_rect.mBottom);
+			gGL.vertex2f(v.mV[0], v.mV[1] );
+
+			v = LLVector3(offset_x, -offset_y, 0.f) * quat;
+			gGL.texCoord2f(uv_rect.mRight, uv_rect.mBottom);
+			gGL.vertex2f(v.mV[0], v.mV[1] );
+		}
+		gGL.end();
+		gGL.popUIMatrix();
+	}
+}
 
 void gl_stippled_line_3d( const LLVector3& start, const LLVector3& end, const LLColor4& color, F32 phase )
 {