Commit ee1e15ac authored by Daniel Lehman's avatar Daniel Lehman Committed by Alexandre Julliard

glu32: Return GLU_INVALID_ENUM for illegal pixel types.

parent 3b61019b
...@@ -3448,10 +3448,10 @@ GLint WINAPI gluScaleImage( GLenum format, GLint widthin, GLint heightin, GLenum ...@@ -3448,10 +3448,10 @@ GLint WINAPI gluScaleImage( GLenum format, GLint widthin, GLint heightin, GLenum
return GLU_INVALID_ENUM; return GLU_INVALID_ENUM;
} }
if (!isLegalFormatForPackedPixelType(format, typein)) { if (!isLegalFormatForPackedPixelType(format, typein)) {
return GLU_INVALID_OPERATION; return GLU_INVALID_ENUM;
} }
if (!isLegalFormatForPackedPixelType(format, typeout)) { if (!isLegalFormatForPackedPixelType(format, typeout)) {
return GLU_INVALID_OPERATION; return GLU_INVALID_ENUM;
} }
if (!wglGetCurrentContext()) { if (!wglGetCurrentContext()) {
return GL_OUT_OF_MEMORY; /* windows returns this if no gl context (not glu error) */ return GL_OUT_OF_MEMORY; /* windows returns this if no gl context (not glu error) */
......
...@@ -72,14 +72,12 @@ static void test_gluScaleImage(HDC hdc, HGLRC hglrc) ...@@ -72,14 +72,12 @@ static void test_gluScaleImage(HDC hdc, HGLRC hglrc)
DIMOUT, DIMOUT, ~0, bufout); DIMOUT, DIMOUT, ~0, bufout);
ok(err == GLU_INVALID_ENUM, "got %x\n", err); ok(err == GLU_INVALID_ENUM, "got %x\n", err);
todo_wine {
err = gluScaleImage(GL_RGBA, DIMIN, DIMIN, GL_UNSIGNED_BYTE_3_3_2, bufin, err = gluScaleImage(GL_RGBA, DIMIN, DIMIN, GL_UNSIGNED_BYTE_3_3_2, bufin,
DIMOUT, DIMOUT, GL_UNSIGNED_BYTE, bufout); DIMOUT, DIMOUT, GL_UNSIGNED_BYTE, bufout);
ok(err == GLU_INVALID_ENUM, "got %x\n", err); ok(err == GLU_INVALID_ENUM, "got %x\n", err);
err = gluScaleImage(GL_RGBA, DIMIN, DIMIN, GL_UNSIGNED_BYTE, bufin, err = gluScaleImage(GL_RGBA, DIMIN, DIMIN, GL_UNSIGNED_BYTE, bufin,
DIMOUT, DIMOUT, GL_UNSIGNED_BYTE_3_3_2, bufout); DIMOUT, DIMOUT, GL_UNSIGNED_BYTE_3_3_2, bufout);
ok(err == GLU_INVALID_ENUM, "got %x\n", err); ok(err == GLU_INVALID_ENUM, "got %x\n", err);
}
/* valid arguments */ /* valid arguments */
memset(bufout, 0, SIZEOUT); memset(bufout, 0, SIZEOUT);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment