projects
/
mesa.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
i965/miptree: Rename align_w,align_h -> halign,valign
[mesa.git]
/
src
/
mesa
/
drivers
/
dri
/
i965
/
gen7_wm_surface_state.c
diff --git
a/src/mesa/drivers/dri/i965/gen7_wm_surface_state.c
b/src/mesa/drivers/dri/i965/gen7_wm_surface_state.c
index 15ab2b0eae3a1de6d273ef1ad29663c2e73ffafc..5080f1c3fe461dbf93fc19e1568a353b50427127 100644
(file)
--- a/
src/mesa/drivers/dri/i965/gen7_wm_surface_state.c
+++ b/
src/mesa/drivers/dri/i965/gen7_wm_surface_state.c
@@
-288,9
+288,9
@@
gen7_emit_texture_surface_state(struct brw_context *brw,
if (target == GL_TEXTURE_CUBE_MAP || target == GL_TEXTURE_CUBE_MAP_ARRAY)
surf[0] |= BRW_SURFACE_CUBEFACE_ENABLES;
if (target == GL_TEXTURE_CUBE_MAP || target == GL_TEXTURE_CUBE_MAP_ARRAY)
surf[0] |= BRW_SURFACE_CUBEFACE_ENABLES;
- if (mt->
align_h
== 4)
+ if (mt->
valign
== 4)
surf[0] |= GEN7_SURFACE_VALIGN_4;
surf[0] |= GEN7_SURFACE_VALIGN_4;
- if (mt->
align_w
== 8)
+ if (mt->
halign
== 8)
surf[0] |= GEN7_SURFACE_HALIGN_8;
if (_mesa_is_array_texture(target) || target == GL_TEXTURE_CUBE_MAP)
surf[0] |= GEN7_SURFACE_HALIGN_8;
if (_mesa_is_array_texture(target) || target == GL_TEXTURE_CUBE_MAP)
@@
-509,9
+509,9
@@
gen7_update_renderbuffer_surface(struct brw_context *brw,
GEN7_SURFACE_ARYSPC_LOD0 : GEN7_SURFACE_ARYSPC_FULL) |
gen7_surface_tiling_mode(mt->tiling);
GEN7_SURFACE_ARYSPC_LOD0 : GEN7_SURFACE_ARYSPC_FULL) |
gen7_surface_tiling_mode(mt->tiling);
- if (irb->mt->
align_h
== 4)
+ if (irb->mt->
valign
== 4)
surf[0] |= GEN7_SURFACE_VALIGN_4;
surf[0] |= GEN7_SURFACE_VALIGN_4;
- if (irb->mt->
align_w
== 8)
+ if (irb->mt->
halign
== 8)
surf[0] |= GEN7_SURFACE_HALIGN_8;
if (is_array) {
surf[0] |= GEN7_SURFACE_HALIGN_8;
if (is_array) {