Fix a couple of glitches

This commit is contained in:
Keith Whitwell 2004-12-10 17:18:00 +00:00
parent 3cc28c96cd
commit 5aa1a111a4
1 changed files with 6 additions and 5 deletions

View File

@ -60,7 +60,7 @@ static void Display( void )
glBindTexture(GL_TEXTURE_2D, yuvObj); glBindTexture(GL_TEXTURE_2D, yuvObj);
glPushMatrix(); glPushMatrix();
glEnable(GL_FRAGMENT_PROGRAM_ARB); glEnable(GL_FRAGMENT_PROGRAM_ARB);
glTranslatef( -1.1, 0.0, -15.0 ); glTranslatef( -1.1, 0.0, -15.0 );
glRotatef(Xrot, 1.0, 0.0, 0.0); glRotatef(Xrot, 1.0, 0.0, 0.0);
glRotatef(Yrot, 0.0, 1.0, 0.0); glRotatef(Yrot, 0.0, 1.0, 0.0);
@ -140,10 +140,10 @@ static void Init( int argc, char *argv[] )
{ {
const char *file; const char *file;
const GLfloat yuvtorgb[16] = { const GLfloat yuvtorgb[16] = {
1.164, 1.596, 0, (.06*1.164 + -.5*1.596), 1.164, 1.164, 1.164, 0,
1.164, -.813, -.391, (.06*1.164 + -.5*-.813 + -.5*-.391), 0, -.391, 2.018, 0,
1.164, 0, 2.018, (.06*1.164 + -.5*-2.018), 1.596, -.813, 0.0, 0,
0, 0, 0, 1 (-.0625*1.164 + -.5*1.596), (-.0625*1.164 + -.5*-.813 + -.5*-.391), (-.0625*1.164 + -.5*2.018), 1
}; };
if (!glutExtensionSupported("GL_ARB_fragment_program")) { if (!glutExtensionSupported("GL_ARB_fragment_program")) {
@ -230,6 +230,7 @@ static void Init( int argc, char *argv[] )
GL_UNSIGNED_BYTE, ImageYUV); GL_UNSIGNED_BYTE, ImageYUV);
glLoadIdentity(); glLoadIdentity();
glMatrixMode( GL_MODELVIEW );
glEnable(GL_TEXTURE_2D); glEnable(GL_TEXTURE_2D);