projects
/
mesa.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge remote branch 'origin/7.8'
[mesa.git]
/
src
/
mesa
/
drivers
/
dri
/
i965
/
brw_tex_layout.c
diff --git
a/src/mesa/drivers/dri/i965/brw_tex_layout.c
b/src/mesa/drivers/dri/i965/brw_tex_layout.c
index 5986cbffade3ee81180863ec6388dd7d95228dc1..b1f56a8e6488c179b5a6684f0a66e51fb4ac1317 100644
(file)
--- a/
src/mesa/drivers/dri/i965/brw_tex_layout.c
+++ b/
src/mesa/drivers/dri/i965/brw_tex_layout.c
@@
-36,7
+36,6
@@
#include "intel_tex_layout.h"
#include "intel_context.h"
#include "main/macros.h"
#include "intel_tex_layout.h"
#include "intel_context.h"
#include "main/macros.h"
-#include "intel_chipset.h"
#define FILE_DEBUG_FLAG DEBUG_MIPTREE
#define FILE_DEBUG_FLAG DEBUG_MIPTREE
@@
-49,7
+48,7
@@
GLboolean brw_miptree_layout(struct intel_context *intel,
switch (mt->target) {
case GL_TEXTURE_CUBE_MAP:
switch (mt->target) {
case GL_TEXTURE_CUBE_MAP:
- if (
IS_IGDNG(intel->intelScreen->deviceID)
) {
+ if (
intel->is_ironlake
) {
GLuint align_h = 2, align_w = 4;
GLuint level;
GLuint x = 0;
GLuint align_h = 2, align_w = 4;
GLuint level;
GLuint x = 0;
@@
-59,12
+58,12
@@
GLboolean brw_miptree_layout(struct intel_context *intel,
GLuint qpitch = 0;
GLuint y_pitch = 0;
GLuint qpitch = 0;
GLuint y_pitch = 0;
- mt->
pitc
h = mt->width0;
+ mt->
total_widt
h = mt->width0;
intel_get_texture_alignment_unit(mt->internal_format, &align_w, &align_h);
y_pitch = ALIGN(height, align_h);
if (mt->compressed) {
intel_get_texture_alignment_unit(mt->internal_format, &align_w, &align_h);
y_pitch = ALIGN(height, align_h);
if (mt->compressed) {
- mt->
pitc
h = ALIGN(mt->width0, align_w);
+ mt->
total_widt
h = ALIGN(mt->width0, align_w);
}
if (mt->first_level != mt->last_level) {
}
if (mt->first_level != mt->last_level) {
@@
-78,18
+77,16
@@
GLboolean brw_miptree_layout(struct intel_context *intel,
+ minify(minify(mt->width0));
}
+ minify(minify(mt->width0));
}
- if (mip1_width > mt->
pitc
h) {
- mt->
pitc
h = mip1_width;
+ if (mip1_width > mt->
total_widt
h) {
+ mt->
total_widt
h = mip1_width;
}
}
}
}
- mt->pitch = intel_miptree_pitch_align(intel, mt, tiling, mt->pitch);
-
if (mt->compressed) {
if (mt->compressed) {
- qpitch = (y_pitch + ALIGN(minify(y_pitch), align_h) + 11 * align_h) / 4
* mt->pitch * mt->cpp
;
+ qpitch = (y_pitch + ALIGN(minify(y_pitch), align_h) + 11 * align_h) / 4;
mt->total_height = (y_pitch + ALIGN(minify(y_pitch), align_h) + 11 * align_h) / 4 * 6;
} else {
mt->total_height = (y_pitch + ALIGN(minify(y_pitch), align_h) + 11 * align_h) / 4 * 6;
} else {
- qpitch = (y_pitch + ALIGN(minify(y_pitch), align_h) + 11 * align_h)
* mt->pitch * mt->cpp
;
+ qpitch = (y_pitch + ALIGN(minify(y_pitch), align_h) + 11 * align_h);
mt->total_height = (y_pitch + ALIGN(minify(y_pitch), align_h) + 11 * align_h) * 6;
}
mt->total_height = (y_pitch + ALIGN(minify(y_pitch), align_h) + 11 * align_h) * 6;
}
@@
-102,7
+99,8
@@
GLboolean brw_miptree_layout(struct intel_context *intel,
height, 1);
for (q = 0; q < nr_images; q++)
height, 1);
for (q = 0; q < nr_images; q++)
- intel_miptree_set_image_offset_ex(mt, level, q, x, y, q * qpitch);
+ intel_miptree_set_image_offset(mt, level, q,
+ x, y + q * qpitch);
if (mt->compressed)
img_height = MAX2(1, height/4);
if (mt->compressed)
img_height = MAX2(1, height/4);
@@
-137,10
+135,10
@@
GLboolean brw_miptree_layout(struct intel_context *intel,
intel_get_texture_alignment_unit(mt->internal_format, &align_w, &align_h);
if (mt->compressed) {
intel_get_texture_alignment_unit(mt->internal_format, &align_w, &align_h);
if (mt->compressed) {
- mt->
pitc
h = ALIGN(width, align_w);
+ mt->
total_widt
h = ALIGN(width, align_w);
pack_y_pitch = (height + 3) / 4;
} else {
pack_y_pitch = (height + 3) / 4;
} else {
- mt->
pitch = intel_miptree_pitch_align (intel, mt, tiling, mt->width0)
;
+ mt->
total_width = mt->width0
;
pack_y_pitch = ALIGN(mt->height0, align_h);
}
pack_y_pitch = ALIGN(mt->height0, align_h);
}
@@
-184,7
+182,7
@@
GLboolean brw_miptree_layout(struct intel_context *intel,
if (pack_x_pitch > 4) {
pack_x_pitch >>= 1;
pack_x_nr <<= 1;
if (pack_x_pitch > 4) {
pack_x_pitch >>= 1;
pack_x_nr <<= 1;
- assert(pack_x_pitch * pack_x_nr <= mt->
pitc
h);
+ assert(pack_x_pitch * pack_x_nr <= mt->
total_widt
h);
}
if (pack_y_pitch > 2) {
}
if (pack_y_pitch > 2) {
@@
-211,11
+209,8
@@
GLboolean brw_miptree_layout(struct intel_context *intel,
i945_miptree_layout_2d(intel, mt, tiling);
break;
}
i945_miptree_layout_2d(intel, mt, tiling);
break;
}
- DBG("%s: %dx%dx%d - sz 0x%x\n", __FUNCTION__,
- mt->pitch,
- mt->total_height,
- mt->cpp,
- mt->pitch * mt->total_height * mt->cpp );
+ DBG("%s: %dx%dx%d\n", __FUNCTION__,
+ mt->total_width, mt->total_height, mt->cpp);
return GL_TRUE;
}
return GL_TRUE;
}