projects
/
mesa.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
mesa: minor whitespace fixes in teximage.c
[mesa.git]
/
src
/
mesa
/
main
/
accum.c
diff --git
a/src/mesa/main/accum.c
b/src/mesa/main/accum.c
index df6f219bf301ff365f48a2589a90312e7df2e628..8b71640df6c483000714657d575a89e6f62668c0 100644
(file)
--- a/
src/mesa/main/accum.c
+++ b/
src/mesa/main/accum.c
@@
-36,9
+36,6
@@
#include "main/dispatch.h"
#include "main/dispatch.h"
-#if FEATURE_accum
-
-
void GLAPIENTRY
_mesa_ClearAccum( GLfloat red, GLfloat green, GLfloat blue, GLfloat alpha )
{
void GLAPIENTRY
_mesa_ClearAccum( GLfloat red, GLfloat green, GLfloat blue, GLfloat alpha )
{
@@
-289,7
+286,7
@@
accum_or_load(struct gl_context *ctx, GLfloat value,
GLuint i, j;
GLfloat (*rgba)[4];
GLuint i, j;
GLfloat (*rgba)[4];
- rgba =
(GLfloat (*)[4])
malloc(width * 4 * sizeof(GLfloat));
+ rgba = malloc(width * 4 * sizeof(GLfloat));
if (rgba) {
for (j = 0; j < height; j++) {
GLshort *acc = (GLshort *) accMap;
if (rgba) {
for (j = 0; j < height; j++) {
GLshort *acc = (GLshort *) accMap;
@@
-381,8
+378,8
@@
accum_return(struct gl_context *ctx, GLfloat value,
GLint i, j;
GLfloat (*rgba)[4], (*dest)[4];
GLint i, j;
GLfloat (*rgba)[4], (*dest)[4];
- rgba =
(GLfloat (*)[4])
malloc(width * 4 * sizeof(GLfloat));
- dest =
(GLfloat (*)[4])
malloc(width * 4 * sizeof(GLfloat));
+ rgba = malloc(width * 4 * sizeof(GLfloat));
+ dest = malloc(width * 4 * sizeof(GLfloat));
if (rgba && dest) {
for (j = 0; j < height; j++) {
if (rgba && dest) {
for (j = 0; j < height; j++) {
@@
-496,9
+493,6
@@
_mesa_accum(struct gl_context *ctx, GLenum op, GLfloat value)
}
}
-#endif /* FEATURE_accum */
-
-
void
_mesa_init_accum( struct gl_context *ctx )
{
void
_mesa_init_accum( struct gl_context *ctx )
{