Module Name: xsrc
Committed By: mrg
Date: Sun May 23 21:40:11 UTC 2010
Modified Files:
xsrc/external/mit/MesaLib/dist/src/mesa/drivers/dri/radeon:
radeon_mipmap_tree.c radeon_queryobj.c
xsrc/external/mit/MesaLib/dist/src/mesa/main: accum.c
Log Message:
make these build with Mesa 7.7.1.
To generate a diff of this commit:
cvs rdiff -u -r1.1.1.1 -r1.2 \
xsrc/external/mit/MesaLib/dist/src/mesa/drivers/dri/radeon/radeon_mipmap_tree.c
\
xsrc/external/mit/MesaLib/dist/src/mesa/drivers/dri/radeon/radeon_queryobj.c
cvs rdiff -u -r1.1.1.2 -r1.2 \
xsrc/external/mit/MesaLib/dist/src/mesa/main/accum.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: xsrc/external/mit/MesaLib/dist/src/mesa/drivers/dri/radeon/radeon_mipmap_tree.c
diff -u xsrc/external/mit/MesaLib/dist/src/mesa/drivers/dri/radeon/radeon_mipmap_tree.c:1.1.1.1 xsrc/external/mit/MesaLib/dist/src/mesa/drivers/dri/radeon/radeon_mipmap_tree.c:1.2
--- xsrc/external/mit/MesaLib/dist/src/mesa/drivers/dri/radeon/radeon_mipmap_tree.c:1.1.1.1 Sun May 23 21:22:27 2010
+++ xsrc/external/mit/MesaLib/dist/src/mesa/drivers/dri/radeon/radeon_mipmap_tree.c Sun May 23 21:40:11 2010
@@ -479,10 +479,14 @@
unsigned mtCount = 0;
unsigned maxMtIndex = 0;
radeon_mipmap_tree *tmp;
+ unsigned level;
+ int i;
- for (unsigned level = firstLevel; level <= lastLevel; ++level) {
+ for (level = firstLevel; level <= lastLevel; ++level) {
radeon_texture_image *img = get_radeon_texture_image(texObj->base.Image[0][level]);
unsigned found = 0;
+ int i;
+
// TODO: why this hack??
if (!img)
break;
@@ -490,7 +494,7 @@
if (!img->mt)
continue;
- for (int i = 0; i < mtCount; ++i) {
+ for (i = 0; i < mtCount; ++i) {
if (mts[i] == img->mt) {
found = 1;
mtSizes[i] += img->mt->levels[img->mtlevel].size;
@@ -509,7 +513,7 @@
return NULL;
}
- for (int i = 1; i < mtCount; ++i) {
+ for (i = 1; i < mtCount; ++i) {
if (mtSizes[i] > mtSizes[maxMtIndex]) {
maxMtIndex = i;
}
Index: xsrc/external/mit/MesaLib/dist/src/mesa/drivers/dri/radeon/radeon_queryobj.c
diff -u xsrc/external/mit/MesaLib/dist/src/mesa/drivers/dri/radeon/radeon_queryobj.c:1.1.1.1 xsrc/external/mit/MesaLib/dist/src/mesa/drivers/dri/radeon/radeon_queryobj.c:1.2
--- xsrc/external/mit/MesaLib/dist/src/mesa/drivers/dri/radeon/radeon_queryobj.c:1.1.1.1 Sun May 23 21:22:27 2010
+++ xsrc/external/mit/MesaLib/dist/src/mesa/drivers/dri/radeon/radeon_queryobj.c Sun May 23 21:40:11 2010
@@ -59,7 +59,7 @@
(uint64_t)LE32_TO_CPU(result[i + 1]) << 32;
uint64_t end = (uint64_t)LE32_TO_CPU(result[i + 2]) |
(uint64_t)LE32_TO_CPU(result[i + 3]) << 32;
- if ((start & 0x8000000000000000) && (end & 0x8000000000000000)) {
+ if ((start & 0x8000000000000000ULL) && (end & 0x8000000000000000ULL)) {
uint64_t query_count = end - start;
query->Base.Result += query_count;
Index: xsrc/external/mit/MesaLib/dist/src/mesa/main/accum.c
diff -u xsrc/external/mit/MesaLib/dist/src/mesa/main/accum.c:1.1.1.2 xsrc/external/mit/MesaLib/dist/src/mesa/main/accum.c:1.2
--- xsrc/external/mit/MesaLib/dist/src/mesa/main/accum.c:1.1.1.2 Sun May 23 21:22:16 2010
+++ xsrc/external/mit/MesaLib/dist/src/mesa/main/accum.c Sun May 23 21:40:11 2010
@@ -28,6 +28,7 @@
#include "imports.h"
#include "macros.h"
#include "state.h"
+#include "GL/glext.h"
#include "mtypes.h"
#include "glapi/dispatch.h"
