projects
/
mesa.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
4d2cee4
)
mesa: move assertion after declarations in texstore.c
author
Brian Paul
<brianp@vmware.com>
Mon, 16 Feb 2015 15:38:56 +0000
(08:38 -0700)
committer
Brian Paul
<brianp@vmware.com>
Mon, 16 Feb 2015 15:39:25 +0000
(08:39 -0700)
To fix MSVC build.
src/mesa/main/texstore.c
patch
|
blob
|
history
diff --git
a/src/mesa/main/texstore.c
b/src/mesa/main/texstore.c
index f25c0d7e0e1b21a0cf19d14e0f09a2e6b355fcec..7039cdf81741a09e1a09c092cf052f3b7b7dacc3 100644
(file)
--- a/
src/mesa/main/texstore.c
+++ b/
src/mesa/main/texstore.c
@@
-729,9
+729,9
@@
texstore_rgba(TEXSTORE_PARAMS)
GLint swapSize = _mesa_sizeof_packed_type(srcType);
if (swapSize == 2 || swapSize == 4) {
int bytesPerPixel = _mesa_bytes_per_pixel(srcFormat, srcType);
- assert(bytesPerPixel % swapSize == 0);
int swapsPerPixel = bytesPerPixel / swapSize;
int elementCount = srcWidth * srcHeight * srcDepth;
+ assert(bytesPerPixel % swapSize == 0);
tempImage = malloc(elementCount * bytesPerPixel);
if (!tempImage)
return GL_FALSE;