diff options
author | Brian <brian.paul@tungstengraphics.com> | 2008-03-10 17:41:00 -0600 |
---|---|---|
committer | Brian <brian.paul@tungstengraphics.com> | 2008-03-10 18:08:14 -0600 |
commit | c813b545ab4726fc5030f123ec6255224d64ad82 (patch) | |
tree | 5e47b7948842bd576bc3841a4428797cc3ce3be0 | |
parent | 7585b4ceb8fed862c07f50af8030a6f0eb8a8321 (diff) |
fix Height2/Depth2 init problem when using texture borders
-rw-r--r-- | src/mesa/main/teximage.c | 23 |
1 files changed, 17 insertions, 6 deletions
diff --git a/src/mesa/main/teximage.c b/src/mesa/main/teximage.c index 5c96be92165..f15e4045278 100644 --- a/src/mesa/main/teximage.c +++ b/src/mesa/main/teximage.c @@ -1214,19 +1214,30 @@ _mesa_init_teximage_fields(GLcontext *ctx, GLenum target, img->Width = width; img->Height = height; img->Depth = depth; + img->Width2 = width - 2 * border; /* == 1 << img->WidthLog2; */ - img->Height2 = height - 2 * border; /* == 1 << img->HeightLog2; */ - img->Depth2 = depth - 2 * border; /* == 1 << img->DepthLog2; */ img->WidthLog2 = logbase2(img->Width2); - if (height == 1) /* 1-D texture */ + + if (height == 1) { /* 1-D texture */ + img->Height2 = 1; img->HeightLog2 = 0; - else + } + else { + img->Height2 = height - 2 * border; /* == 1 << img->HeightLog2; */ img->HeightLog2 = logbase2(img->Height2); - if (depth == 1) /* 2-D texture */ + } + + if (depth == 1) { /* 2-D texture */ + img->Depth2 = 1; img->DepthLog2 = 0; - else + } + else { + img->Depth2 = depth - 2 * border; /* == 1 << img->DepthLog2; */ img->DepthLog2 = logbase2(img->Depth2); + } + img->MaxLog2 = MAX2(img->WidthLog2, img->HeightLog2); + img->IsCompressed = GL_FALSE; img->CompressedSize = 0; |