diff options
| author | Eric Anholt <[email protected]> | 2011-12-13 12:40:09 -0800 |
|---|---|---|
| committer | Eric Anholt <[email protected]> | 2011-12-19 13:20:11 -0800 |
| commit | e71fc6a8200cd78037a9788230ec0cc9f451a4b1 (patch) | |
| tree | d7b0bd09e9078e8bcd62d946790feb129e3ae2a7 | |
| parent | 353f7ba4abbfd15d1e4e4b7a38f88e64ce85f6a2 (diff) | |
i965: Use the miptree format for texture surface format choice.
With separate stencil GL_DEPTH32F_STENCIL8, the miptree will have a
really different format (MESA_FORMAT_Z32_FLOAT) from the teximage
(MESA_FORMAT_Z32_FLOAT_X24S8).
Reviewed-by: Kenneth Graunke <[email protected]>
| -rw-r--r-- | src/mesa/drivers/dri/i965/brw_wm_surface_state.c | 2 | ||||
| -rw-r--r-- | src/mesa/drivers/dri/i965/gen7_wm_surface_state.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/mesa/drivers/dri/i965/brw_wm_surface_state.c b/src/mesa/drivers/dri/i965/brw_wm_surface_state.c index f9b0b714a80..d36b6f871b1 100644 --- a/src/mesa/drivers/dri/i965/brw_wm_surface_state.c +++ b/src/mesa/drivers/dri/i965/brw_wm_surface_state.c @@ -632,7 +632,7 @@ brw_update_texture_surface( struct gl_context *ctx, GLuint unit ) surf[0] = (translate_tex_target(tObj->Target) << BRW_SURFACE_TYPE_SHIFT | BRW_SURFACE_MIPMAPLAYOUT_BELOW << BRW_SURFACE_MIPLAYOUT_SHIFT | BRW_SURFACE_CUBEFACE_ENABLES | - (translate_tex_format(firstImage->TexFormat, + (translate_tex_format(mt->format, firstImage->InternalFormat, sampler->DepthMode, sampler->sRGBDecode) << 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 0defa676bd5..1c0183b70c1 100644 --- a/src/mesa/drivers/dri/i965/gen7_wm_surface_state.c +++ b/src/mesa/drivers/dri/i965/gen7_wm_surface_state.c @@ -76,7 +76,7 @@ gen7_update_texture_surface(struct gl_context *ctx, GLuint unit) surf->ss0.vertical_alignment = 1; surf->ss0.surface_type = translate_tex_target(tObj->Target); - surf->ss0.surface_format = translate_tex_format(firstImage->TexFormat, + surf->ss0.surface_format = translate_tex_format(mt->format, firstImage->InternalFormat, sampler->DepthMode, sampler->sRGBDecode); |