projects
/
mesa.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
mesa: Remove _Active and _UseTexEnvProgram flags from fragment programs.
[mesa.git]
/
src
/
mesa
/
swrast
/
s_copypix.c
diff --git
a/src/mesa/swrast/s_copypix.c
b/src/mesa/swrast/s_copypix.c
index 218a3b5590bddb26e851beffe2b08e7c43093697..fc5990b261c1370a43156f8360fca7446b8879f2 100644
(file)
--- a/
src/mesa/swrast/s_copypix.c
+++ b/
src/mesa/swrast/s_copypix.c
@@
-23,15
+23,15
@@
*/
*/
-#include "glheader.h"
-#include "context.h"
-#include "colormac.h"
-#include "convolve.h"
-#include "histogram.h"
-#include "image.h"
-#include "macros.h"
-#include "imports.h"
-#include "pixel.h"
+#include "
main/
glheader.h"
+#include "
main/
context.h"
+#include "
main/
colormac.h"
+#include "
main/
convolve.h"
+#include "
main/
histogram.h"
+#include "
main/
image.h"
+#include "ma
in/ma
cros.h"
+#include "
main/
imports.h"
+#include "
main/
pixel.h"
#include "s_context.h"
#include "s_depth.h"
#include "s_context.h"
#include "s_depth.h"
@@
-830,10
+830,10
@@
fast_copy_pixels(GLcontext *ctx,
}
if (type == GL_COLOR) {
}
if (type == GL_COLOR) {
- if (dstFb->_NumColorDrawBuffers
[0]
!= 1)
+ if (dstFb->_NumColorDrawBuffers != 1)
return GL_FALSE;
srcRb = srcFb->_ColorReadBuffer;
return GL_FALSE;
srcRb = srcFb->_ColorReadBuffer;
- dstRb = dstFb->_ColorDrawBuffers[0]
[0]
;
+ dstRb = dstFb->_ColorDrawBuffers[0];
}
else if (type == GL_STENCIL) {
srcRb = srcFb->_StencilBuffer;
}
else if (type == GL_STENCIL) {
srcRb = srcFb->_StencilBuffer;