summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJosé Fonseca <jfonseca@vmware.com>2012-05-15 20:24:38 +0100
committerJosé Fonseca <jfonseca@vmware.com>2012-05-15 20:24:38 +0100
commit82e8ae808e28873633f845f6afca1380b4bc2fb8 (patch)
treeb5f3d695caf9a34152c02e9b170be29c3158ca13
parent97aaf3d50e8eace8259ed85ef1c6f56640cd4f3b (diff)
triangle-rasterization-overdraw: Fix MSVC build.
-rw-r--r--tests/general/triangle-rasterization-overdraw.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/tests/general/triangle-rasterization-overdraw.cpp b/tests/general/triangle-rasterization-overdraw.cpp
index 772b3525..f0442a73 100644
--- a/tests/general/triangle-rasterization-overdraw.cpp
+++ b/tests/general/triangle-rasterization-overdraw.cpp
@@ -170,7 +170,7 @@ void TestCase::generate(void)
}
} else {
/* Step around a circle that contains the window */
- double radius = (sqrt(probe_rect.w*probe_rect.w + probe_rect.h*probe_rect.h) / 2.0) + 5.0;
+ double radius = (sqrt((double)(probe_rect.w*probe_rect.w + probe_rect.h*probe_rect.h)) / 2.0) + 5.0;
double perimeter = 2.0 * M_PI * radius;
double pos = 0.0;
@@ -276,7 +276,7 @@ piglit_display(void)
pass = GL_FALSE;
} else {
test_case.generate();
- pass &= test_case.run();
+ pass = pass && test_case.run();
piglit_present_results();
}