diff options
| author | Jouk <[email protected]> | 2007-10-02 15:17:23 +0200 |
|---|---|---|
| committer | Jouk <[email protected]> | 2007-10-02 15:17:23 +0200 |
| commit | 584b84256b07e106cd7295495355eb21226465d7 (patch) | |
| tree | 028d47d265d01f3f96787792fbd41d495d60856c /progs/osdemos/ostest1.c | |
| parent | eb9a5b6d5127858b01ec12672c999e7d25cd7aed (diff) | |
| parent | de1d725f442caa4d8ecbac3256b5a33d1f4a1257 (diff) | |
Merge branch 'master' of git+ssh://[email protected]/git/mesa/mesa
Diffstat (limited to 'progs/osdemos/ostest1.c')
| -rw-r--r-- | progs/osdemos/ostest1.c | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/progs/osdemos/ostest1.c b/progs/osdemos/ostest1.c index 001e3686162..2c7adfc3537 100644 --- a/progs/osdemos/ostest1.c +++ b/progs/osdemos/ostest1.c @@ -409,6 +409,8 @@ test(GLenum type, GLint bits, const char *filename) printf("Rendering %d bit/channel image: %s\n", bits, filename); + OSMesaColorClamp(GL_TRUE); + init_context(); render_image(); if (Gradient) @@ -421,7 +423,7 @@ test(GLenum type, GLint bits, const char *filename) if (WriteFiles && filename != NULL) { if (type == GL_UNSIGNED_SHORT) { GLushort *buffer16 = (GLushort *) buffer; - GLubyte *buffer8 = malloc(WIDTH * HEIGHT * 4); + GLubyte *buffer8 = (GLubyte *) malloc(WIDTH * HEIGHT * 4); int i; for (i = 0; i < WIDTH * HEIGHT * 4; i++) buffer8[i] = buffer16[i] >> 8; @@ -430,8 +432,9 @@ test(GLenum type, GLint bits, const char *filename) } else if (type == GL_FLOAT) { GLfloat *buffer32 = (GLfloat *) buffer; - GLubyte *buffer8 = malloc(WIDTH * HEIGHT * 4); + GLubyte *buffer8 = (GLubyte *) malloc(WIDTH * HEIGHT * 4); int i; + /* colors may be outside [0,1] so we need to clamp */ for (i = 0; i < WIDTH * HEIGHT * 4; i++) buffer8[i] = (GLubyte) (buffer32[i] * 255.0); write_ppm(filename, buffer8, WIDTH, HEIGHT); |