projects
/
mesa.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge commit 'origin/master' into gallium-0.2
[mesa.git]
/
src
/
mesa
/
state_tracker
/
st_cb_accum.c
diff --git
a/src/mesa/state_tracker/st_cb_accum.c
b/src/mesa/state_tracker/st_cb_accum.c
index c0e8c6bf33e7d26eac7dc3c577cb94755742b878..a4e72b48ed4b5cca52461af345bb247a45c7a18a 100644
(file)
--- a/
src/mesa/state_tracker/st_cb_accum.c
+++ b/
src/mesa/state_tracker/st_cb_accum.c
@@
-38,11
+38,12
@@
#include "st_cb_accum.h"
#include "st_cb_fbo.h"
#include "st_draw.h"
#include "st_cb_accum.h"
#include "st_cb_fbo.h"
#include "st_draw.h"
+#include "st_public.h"
#include "st_format.h"
#include "pipe/p_context.h"
#include "pipe/p_defines.h"
#include "pipe/p_inlines.h"
#include "st_format.h"
#include "pipe/p_context.h"
#include "pipe/p_defines.h"
#include "pipe/p_inlines.h"
-#include "util/
p
_tile.h"
+#include "util/
u
_tile.h"
#define UNCLAMPED_FLOAT_TO_SHORT(us, f) \
#define UNCLAMPED_FLOAT_TO_SHORT(us, f) \
@@
-290,7
+291,7
@@
accum_return(GLcontext *ctx, GLfloat value,
for (ch = 0; ch < 4; ch++) {
if (colormask[ch]) {
GLfloat val = abuf[i * 4 + ch] * value;
for (ch = 0; ch < 4; ch++) {
if (colormask[ch]) {
GLfloat val = abuf[i * 4 + ch] * value;
- abuf[i * 4 + ch] = CLAMP(val, 0.0
, 1.0
);
+ abuf[i * 4 + ch] = CLAMP(val, 0.0
f, 1.0f
);
}
else {
abuf[i * 4 + ch] = cbuf[i * 4 + ch];
}
else {
abuf[i * 4 + ch] = cbuf[i * 4 + ch];
@@
-324,7
+325,7
@@
st_Accum(GLcontext *ctx, GLenum op, GLfloat value)
const GLint height = ctx->DrawBuffer->_Ymax - ypos;
/* make sure color bufs aren't cached */
const GLint height = ctx->DrawBuffer->_Ymax - ypos;
/* make sure color bufs aren't cached */
-
pipe->flush(pipe, PIPE_FLUSH_RENDER_CACHE, NULL
);
+
st_flush( st, PIPE_FLUSH_RENDER_CACHE, NULL
);
switch (op) {
case GL_ADD:
switch (op) {
case GL_ADD: