projects
/
mesa.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
i965/fs: Move some flags that affect code generation to fs_visitor.
[mesa.git]
/
src
/
mesa
/
drivers
/
dri
/
i965
/
brw_tex.c
diff --git
a/src/mesa/drivers/dri/i965/brw_tex.c
b/src/mesa/drivers/dri/i965/brw_tex.c
index b1f4de071490886c42ca137fedf1c5ccc75d309d..2cb9aa6503adbf2c7434a40deaca3d41d465d678 100644
(file)
--- a/
src/mesa/drivers/dri/i965/brw_tex.c
+++ b/
src/mesa/drivers/dri/i965/brw_tex.c
@@
-34,7
+34,6
@@
#include "main/mtypes.h"
#include "main/teximage.h"
#include "main/mtypes.h"
#include "main/teximage.h"
-#include "intel_regions.h"
#include "intel_tex.h"
#include "brw_context.h"
#include "intel_tex.h"
#include "brw_context.h"
@@
-46,11
+45,12
@@
void brw_validate_textures( struct brw_context *brw )
{
struct gl_context *ctx = &brw->ctx;
int i;
{
struct gl_context *ctx = &brw->ctx;
int i;
+ int maxEnabledUnit = ctx->Texture._MaxEnabledTexImageUnit;
- for (i = 0; i <
ctx->Const.MaxCombinedTextureImageUnits
; i++) {
+ for (i = 0; i <
= maxEnabledUnit
; i++) {
struct gl_texture_unit *texUnit = &ctx->Texture.Unit[i];
struct gl_texture_unit *texUnit = &ctx->Texture.Unit[i];
- if (texUnit->_
ReallyEnabled
) {
+ if (texUnit->_
Current
) {
intel_finalize_mipmap_tree(brw, i);
}
}
intel_finalize_mipmap_tree(brw, i);
}
}