diff options
| author | marha <marha@users.sourceforge.net> | 2012-10-30 10:18:15 +0100 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2012-10-30 10:18:15 +0100 |
| commit | 33d29586bf3a280e821e0bf62694492dba459dab (patch) | |
| tree | e029e900674f4f8901cae65c95acd3e15ce3948c /mesalib/src/mesa/main/accum.c | |
| parent | af2d8fb974d476eadcd3cde3baebd038f5750600 (diff) | |
| parent | 7b3f315a5d8b90dcb0db5512ed91fa700027cb7a (diff) | |
| download | vcxsrv-33d29586bf3a280e821e0bf62694492dba459dab.tar.gz vcxsrv-33d29586bf3a280e821e0bf62694492dba459dab.tar.bz2 vcxsrv-33d29586bf3a280e821e0bf62694492dba459dab.zip | |
Merge remote-tracking branch 'origin/released'
* origin/released:
fontconfig xserver mesa git update 30 oct 2012
Conflicts:
xorg-server/dix/grabs.c
xorg-server/hw/xwin/winclipboard.h
xorg-server/hw/xwin/winclipboardthread.c
xorg-server/hw/xwin/winclipboardwrappers.c
xorg-server/hw/xwin/winmonitors.c
xorg-server/hw/xwin/winmsg.c
xorg-server/hw/xwin/winmsg.h
xorg-server/hw/xwin/winprefslex.l
xorg-server/hw/xwin/winprefsyacc.y
xorg-server/hw/xwin/winregistry.c
Diffstat (limited to 'mesalib/src/mesa/main/accum.c')
| -rw-r--r-- | mesalib/src/mesa/main/accum.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/mesalib/src/mesa/main/accum.c b/mesalib/src/mesa/main/accum.c index 8b71640df..e2d7726b5 100644 --- a/mesalib/src/mesa/main/accum.c +++ b/mesalib/src/mesa/main/accum.c @@ -205,7 +205,7 @@ accum_scale_or_bias(struct gl_context *ctx, GLfloat value, if (accRb->Format == MESA_FORMAT_SIGNED_RGBA_16) { const GLshort incr = (GLshort) (value * 32767.0f); - GLuint i, j; + GLint i, j; if (bias) { for (j = 0; j < height; j++) { GLshort *acc = (GLshort *) accMap; @@ -283,7 +283,7 @@ accum_or_load(struct gl_context *ctx, GLfloat value, if (accRb->Format == MESA_FORMAT_SIGNED_RGBA_16) { const GLfloat scale = value * 32767.0f; - GLuint i, j; + GLint i, j; GLfloat (*rgba)[4]; rgba = malloc(width * 4 * sizeof(GLfloat)); |