diff options
| author | Xiang, Haihao <haihao.xiang@intel.com> | 2007-08-13 11:43:37 +0800 |
|---|---|---|
| committer | Xiang, Haihao <haihao.xiang@intel.com> | 2007-08-13 11:43:37 +0800 |
| commit | c9e4aa2b303f9056564724ece0e2733a54d9f569 (patch) | |
| tree | e1b7aec0f59b50f39b94efdb6d3d5c6ffeb49467 /src/mesa/drivers/dri/i915/intel_tex.c | |
| parent | 21b37b9687b078297935062e3ad9f379b6f36519 (diff) | |
i915: satisfy certain alignment restrictions for small
compressed texture
Diffstat (limited to 'src/mesa/drivers/dri/i915/intel_tex.c')
| -rw-r--r-- | src/mesa/drivers/dri/i915/intel_tex.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/src/mesa/drivers/dri/i915/intel_tex.c b/src/mesa/drivers/dri/i915/intel_tex.c index 5bd280652a..978945f26b 100644 --- a/src/mesa/drivers/dri/i915/intel_tex.c +++ b/src/mesa/drivers/dri/i915/intel_tex.c @@ -643,17 +643,19 @@ static void intelUploadTexImage( intelContextPtr intel, switch (image->InternalFormat) { case GL_COMPRESSED_RGB_FXT1_3DFX: case GL_COMPRESSED_RGBA_FXT1_3DFX: + row_len = ((image->Width + 7) & ~7) * 2; + break; case GL_RGB_S3TC: case GL_RGB4_S3TC: case GL_COMPRESSED_RGB_S3TC_DXT1_EXT: case GL_COMPRESSED_RGBA_S3TC_DXT1_EXT: - row_len = (image->Width * 2 + 7) & ~7; + row_len = ((image->Width + 3) & ~3) * 2; break; case GL_RGBA_S3TC: case GL_RGBA4_S3TC: case GL_COMPRESSED_RGBA_S3TC_DXT3_EXT: case GL_COMPRESSED_RGBA_S3TC_DXT5_EXT: - row_len = (image->Width * 4 + 15) & ~15; + row_len = ((image->Width + 3) & ~3) * 4; break; default: fprintf(stderr,"Internal Compressed format not supported %d\n", image->InternalFormat); |