[artoolkit-commits] artoolkit/lib/SRC/Gl gsub_lite.c,1.11,1.12 gsub.c,1.3,1.4
Optical marker tracking and overlay for augmented reality.
Brought to you by:
philip_lamb
Menu
▾
▴
[artoolkit-commits] artoolkit/lib/SRC/Gl gsub_lite.c,1.11,1.12 gsub.c,1.3,1.4
|
From: Philip L. <phi...@us...> - 2006-04-05 05:48:13
|
Update of /cvsroot/artoolkit/artoolkit/lib/SRC/Gl In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv31678 Modified Files: gsub_lite.c gsub.c Log Message: Move pixel format from gsub_lite into global namespace. Index: gsub_lite.c =================================================================== RCS file: /cvsroot/artoolkit/artoolkit/lib/SRC/Gl/gsub_lite.c,v retrieving revision 1.11 retrieving revision 1.12 diff -C2 -d -r1.11 -r1.12 *** gsub_lite.c 22 Sep 2005 19:44:36 -0000 1.11 --- gsub_lite.c 5 Apr 2006 05:48:03 -0000 1.12 *************** *** 18,21 **** --- 18,22 ---- * 2.7.8 2005-07-29 PRL Added distortion compensation enabling/disabling. * 2.7.9 2005-08-15 PRL Added complete support for runtime selection of pixel format and rectangle/power-of-2 textures. + * 2.8.0 2006-04-04 PRL Move pixel format constants into toolkit global namespace (in config.h). * */ *************** *** 685,707 **** contextSettings = (ARGL_CONTEXT_SETTINGS_REF)calloc(1, sizeof(ARGL_CONTEXT_SETTINGS)); // Use default pixel format handed to us by <AR/config.h>. ! #if defined(AR_PIX_FORMAT_RGBA) ! arglPixelFormatSet(contextSettings, ARGL_PIX_FORMAT_RGBA); ! #elif defined(AR_PIX_FORMAT_ABGR) ! arglPixelFormatSet(contextSettings, ARGL_PIX_FORMAT_ABGR); ! #elif defined(AR_PIX_FORMAT_BGRA) ! arglPixelFormatSet(contextSettings, ARGL_PIX_FORMAT_BGRA); ! #elif defined(AR_PIX_FORMAT_ARGB) ! arglPixelFormatSet(contextSettings, ARGL_PIX_FORMAT_ARGB); ! #elif defined(AR_PIX_FORMAT_RGB) ! arglPixelFormatSet(contextSettings, ARGL_PIX_FORMAT_RGB); ! #elif defined(AR_PIX_FORMAT_BGR) ! arglPixelFormatSet(contextSettings, ARGL_PIX_FORMAT_BGR); ! #elif defined(AR_PIX_FORMAT_2vuy) ! arglPixelFormatSet(contextSettings, ARGL_PIX_FORMAT_2vuy); ! #elif defined(AR_PIX_FORMAT_yuvs) ! arglPixelFormatSet(contextSettings, ARGL_PIX_FORMAT_yuvs); ! #else ! # error Unknown pixel format defined in config.h. ! #endif return (contextSettings); } --- 686,694 ---- contextSettings = (ARGL_CONTEXT_SETTINGS_REF)calloc(1, sizeof(ARGL_CONTEXT_SETTINGS)); // Use default pixel format handed to us by <AR/config.h>. ! fprintf(stderr, "pix fmt is %d \n", AR_PIXEL_FORMAT_DEFAULT); ! if (!arglPixelFormatSet(contextSettings, AR_PIXEL_FORMAT_DEFAULT)) { ! fprintf(stderr, "Unknown default pixel format defined in config.h.\n"); ! return (NULL); ! } return (contextSettings); } *************** *** 838,846 **** } ! int arglPixelFormatSet(ARGL_CONTEXT_SETTINGS_REF contextSettings, ARGL_PIX_FORMAT format) { if (!contextSettings) return (FALSE); switch (format) { ! case ARGL_PIX_FORMAT_RGBA: contextSettings->pixIntFormat = GL_RGBA; contextSettings->pixFormat = GL_RGBA; --- 825,833 ---- } ! int arglPixelFormatSet(ARGL_CONTEXT_SETTINGS_REF contextSettings, AR_PIXEL_FORMAT format) { if (!contextSettings) return (FALSE); switch (format) { ! case AR_PIXEL_FORMAT_RGBA: contextSettings->pixIntFormat = GL_RGBA; contextSettings->pixFormat = GL_RGBA; *************** *** 848,852 **** contextSettings->pixSize = 4; break; ! case ARGL_PIX_FORMAT_ABGR: // SGI. contextSettings->pixIntFormat = GL_RGBA; contextSettings->pixFormat = GL_ABGR_EXT; --- 835,839 ---- contextSettings->pixSize = 4; break; ! case AR_PIXEL_FORMAT_ABGR: // SGI. contextSettings->pixIntFormat = GL_RGBA; contextSettings->pixFormat = GL_ABGR_EXT; *************** *** 854,858 **** contextSettings->pixSize = 4; break; ! case ARGL_PIX_FORMAT_BGRA: // Windows. contextSettings->pixIntFormat = GL_RGBA; contextSettings->pixFormat = GL_BGRA; --- 841,845 ---- contextSettings->pixSize = 4; break; ! case AR_PIXEL_FORMAT_BGRA: // Windows. contextSettings->pixIntFormat = GL_RGBA; contextSettings->pixFormat = GL_BGRA; *************** *** 860,864 **** contextSettings->pixSize = 4; break; ! case ARGL_PIX_FORMAT_ARGB: // Mac. contextSettings->pixIntFormat = GL_RGBA; contextSettings->pixFormat = GL_BGRA; --- 847,851 ---- contextSettings->pixSize = 4; break; ! case AR_PIXEL_FORMAT_ARGB: // Mac. contextSettings->pixIntFormat = GL_RGBA; contextSettings->pixFormat = GL_BGRA; *************** *** 866,870 **** contextSettings->pixSize = 4; break; ! case ARGL_PIX_FORMAT_RGB: contextSettings->pixIntFormat = GL_RGB; contextSettings->pixFormat = GL_RGB; --- 853,857 ---- contextSettings->pixSize = 4; break; ! case AR_PIXEL_FORMAT_RGB: contextSettings->pixIntFormat = GL_RGB; contextSettings->pixFormat = GL_RGB; *************** *** 872,876 **** contextSettings->pixSize = 3; break; ! case ARGL_PIX_FORMAT_BGR: contextSettings->pixIntFormat = GL_RGB; contextSettings->pixFormat = GL_BGR; --- 859,863 ---- contextSettings->pixSize = 3; break; ! case AR_PIXEL_FORMAT_BGR: contextSettings->pixIntFormat = GL_RGB; contextSettings->pixFormat = GL_BGR; *************** *** 878,882 **** contextSettings->pixSize = 3; break; ! case ARGL_PIX_FORMAT_2vuy: contextSettings->pixIntFormat = GL_RGB; contextSettings->pixFormat = GL_YCBCR_422_APPLE; --- 865,869 ---- contextSettings->pixSize = 3; break; ! case AR_PIXEL_FORMAT_2vuy: contextSettings->pixIntFormat = GL_RGB; contextSettings->pixFormat = GL_YCBCR_422_APPLE; *************** *** 884,888 **** contextSettings->pixSize = 2; break; ! case ARGL_PIX_FORMAT_yuvs: contextSettings->pixIntFormat = GL_RGB; contextSettings->pixFormat = GL_YCBCR_422_APPLE; --- 871,875 ---- contextSettings->pixSize = 2; break; ! case AR_PIXEL_FORMAT_yuvs: contextSettings->pixIntFormat = GL_RGB; contextSettings->pixFormat = GL_YCBCR_422_APPLE; *************** *** 898,929 **** } ! int arglPixelFormatGet(ARGL_CONTEXT_SETTINGS_REF contextSettings, ARGL_PIX_FORMAT *format, int *size) { if (!contextSettings) return (FALSE); switch (contextSettings->pixFormat) { case GL_RGBA: ! *format = ARGL_PIX_FORMAT_RGBA; *size = 4; break; case GL_ABGR_EXT: ! *format = ARGL_PIX_FORMAT_ABGR; *size = 4; break; case GL_BGRA: ! if (contextSettings->pixType == GL_UNSIGNED_BYTE) *format = ARGL_PIX_FORMAT_BGRA; ! else *format = ARGL_PIX_FORMAT_ARGB; *size = 4; break; case GL_RGB: ! *format = ARGL_PIX_FORMAT_RGB; *size = 3; break; case GL_BGR: ! *format = ARGL_PIX_FORMAT_BGR; *size = 3; break; case GL_YCBCR_422_APPLE: ! if (contextSettings->pixType == GL_UNSIGNED_SHORT_8_8_REV_APPLE) *format = ARGL_PIX_FORMAT_2vuy; ! else *format = ARGL_PIX_FORMAT_yuvs; *size = 2; break; --- 885,916 ---- } ! int arglPixelFormatGet(ARGL_CONTEXT_SETTINGS_REF contextSettings, AR_PIXEL_FORMAT *format, int *size) { if (!contextSettings) return (FALSE); switch (contextSettings->pixFormat) { case GL_RGBA: ! *format = AR_PIXEL_FORMAT_RGBA; *size = 4; break; case GL_ABGR_EXT: ! *format = AR_PIXEL_FORMAT_ABGR; *size = 4; break; case GL_BGRA: ! if (contextSettings->pixType == GL_UNSIGNED_BYTE) *format = AR_PIXEL_FORMAT_BGRA; ! else *format = AR_PIXEL_FORMAT_ARGB; *size = 4; break; case GL_RGB: ! *format = AR_PIXEL_FORMAT_RGB; *size = 3; break; case GL_BGR: ! *format = AR_PIXEL_FORMAT_BGR; *size = 3; break; case GL_YCBCR_422_APPLE: ! if (contextSettings->pixType == GL_UNSIGNED_SHORT_8_8_REV_APPLE) *format = AR_PIXEL_FORMAT_2vuy; ! else *format = AR_PIXEL_FORMAT_yuvs; *size = 2; break; Index: gsub.c =================================================================== RCS file: /cvsroot/artoolkit/artoolkit/lib/SRC/Gl/gsub.c,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** gsub.c 20 Jul 2005 22:38:35 -0000 1.3 --- gsub.c 5 Apr 2006 05:48:03 -0000 1.4 *************** *** 419,440 **** glRasterPos3f( sx, sy, -1.0 ); ! #if defined(AR_PIX_FORMAT_ARGB) glDrawPixels( gImXsize, gImYsize, GL_BGRA, GL_UNSIGNED_INT_8_8_8_8_REV, image ); ! #elif defined(AR_PIX_FORMAT_ABGR) glDrawPixels( gImXsize, gImYsize, GL_ABGR, GL_UNSIGNED_BYTE, image ); ! #elif defined(AR_PIX_FORMAT_BGRA) glDrawPixels( gImXsize, gImYsize, GL_BGRA, GL_UNSIGNED_BYTE, image ); ! #elif defined(AR_PIX_FORMAT_BGR) glDrawPixels( gImXsize, gImYsize, GL_BGR, GL_UNSIGNED_BYTE, image ); ! #elif defined(AR_PIX_FORMAT_RGBA) glDrawPixels( gImXsize, gImYsize, GL_RGBA, GL_UNSIGNED_BYTE, image ); ! #elif defined(AR_PIX_FORMAT_RGB) glDrawPixels( gImXsize, gImYsize, GL_RGB, GL_UNSIGNED_BYTE, image ); ! #elif defined(AR_PIX_FORMAT_2vuy) glDrawPixels( gImXsize, gImYsize, GL_YCBCR_422_APPLE, GL_UNSIGNED_SHORT_8_8_REV_APPLE, image ); ! #elif defined(AR_PIX_FORMAT_yuvs) glDrawPixels( gImXsize, gImYsize, GL_YCBCR_422_APPLE, GL_UNSIGNED_SHORT_8_8_APPLE, image ); #else ! # error Unknown pixel format defined in config.h #endif } --- 419,440 ---- glRasterPos3f( sx, sy, -1.0 ); ! #if (AR_PIXEL_FORMAT_DEFAULT == AR_PIXEL_FORMAT_ARGB) glDrawPixels( gImXsize, gImYsize, GL_BGRA, GL_UNSIGNED_INT_8_8_8_8_REV, image ); ! #elif (AR_PIXEL_FORMAT_DEFAULT == AR_PIXEL_FORMAT_ABGR) glDrawPixels( gImXsize, gImYsize, GL_ABGR, GL_UNSIGNED_BYTE, image ); ! #elif (AR_PIXEL_FORMAT_DEFAULT == AR_PIXEL_FORMAT_BGRA) glDrawPixels( gImXsize, gImYsize, GL_BGRA, GL_UNSIGNED_BYTE, image ); ! #elif (AR_PIXEL_FORMAT_DEFAULT == AR_PIXEL_FORMAT_BGR) glDrawPixels( gImXsize, gImYsize, GL_BGR, GL_UNSIGNED_BYTE, image ); ! #elif (AR_PIXEL_FORMAT_DEFAULT == AR_PIXEL_FORMAT_RGBA) glDrawPixels( gImXsize, gImYsize, GL_RGBA, GL_UNSIGNED_BYTE, image ); ! #elif (AR_PIXEL_FORMAT_DEFAULT == AR_PIXEL_FORMAT_RGB) glDrawPixels( gImXsize, gImYsize, GL_RGB, GL_UNSIGNED_BYTE, image ); ! #elif (AR_PIXEL_FORMAT_DEFAULT == AR_PIXEL_FORMAT_2vuy) glDrawPixels( gImXsize, gImYsize, GL_YCBCR_422_APPLE, GL_UNSIGNED_SHORT_8_8_REV_APPLE, image ); ! #elif (AR_PIXEL_FORMAT_DEFAULT == AR_PIXEL_FORMAT_yuvs) glDrawPixels( gImXsize, gImYsize, GL_YCBCR_422_APPLE, GL_UNSIGNED_SHORT_8_8_APPLE, image ); #else ! # error Unknown default pixel format defined in config.h #endif } *************** *** 495,537 **** glPixelStorei( GL_UNPACK_ROW_LENGTH, gImXsize*size_adjust_factor ); if( size_adjust_factor == old_size_adjust_factor ) { ! #if defined(AR_PIX_FORMAT_ARGB) glTexSubImage2D( AR_TEXTURE_RECTANGLE, 0, 0, 0, gImXsize, gImYsize/size_adjust_factor, GL_BGRA, GL_UNSIGNED_INT_8_8_8_8_REV, image ); ! #elif defined(AR_PIX_FORMAT_ABGR) glTexSubImage2D( AR_TEXTURE_RECTANGLE, 0, 0, 0, gImXsize, gImYsize/size_adjust_factor, GL_ABGR, GL_UNSIGNED_BYTE, image ); ! #elif defined(AR_PIX_FORMAT_BGRA) glTexSubImage2D( AR_TEXTURE_RECTANGLE, 0, 0, 0, gImXsize, gImYsize/size_adjust_factor, GL_BGRA, GL_UNSIGNED_BYTE, image ); ! #elif defined(AR_PIX_FORMAT_BGR) glTexSubImage2D( AR_TEXTURE_RECTANGLE, 0, 0, 0, gImXsize, gImYsize/size_adjust_factor, GL_BGR, GL_UNSIGNED_BYTE, image ); ! #elif defined(AR_PIX_FORMAT_RGBA) glTexSubImage2D( AR_TEXTURE_RECTANGLE, 0, 0, 0, gImXsize, gImYsize/size_adjust_factor, GL_RGBA, GL_UNSIGNED_BYTE, image ); ! #elif defined(AR_PIX_FORMAT_RGB) glTexSubImage2D( AR_TEXTURE_RECTANGLE, 0, 0, 0, gImXsize, gImYsize/size_adjust_factor, GL_RGB, GL_UNSIGNED_BYTE, image ); ! #elif defined(AR_PIX_FORMAT_2vuy) glTexSubImage2D( AR_TEXTURE_RECTANGLE, 0, 0, 0, gImXsize, gImYsize/size_adjust_factor, GL_YCBCR_422_APPLE, GL_UNSIGNED_SHORT_8_8_REV_APPLE, image ); ! #elif defined(AR_PIX_FORMAT_yuvs) glTexSubImage2D( AR_TEXTURE_RECTANGLE, 0, 0, 0, gImXsize, gImYsize/size_adjust_factor, GL_YCBCR_422_APPLE, GL_UNSIGNED_SHORT_8_8_APPLE, image ); #else ! # error Unknown pixel format defined in config.h #endif } else { ! #if defined(AR_PIX_FORMAT_ARGB) glTexImage2D( AR_TEXTURE_RECTANGLE, 0, 3, gImXsize, gImYsize/size_adjust_factor, 0, GL_BGRA, GL_UNSIGNED_INT_8_8_8_8_REV, image ); ! #elif defined(AR_PIX_FORMAT_ABGR) glTexImage2D( AR_TEXTURE_RECTANGLE, 0, 3, gImXsize, gImYsize/size_adjust_factor, 0, GL_ABGR, GL_UNSIGNED_BYTE, image ); ! #elif defined(AR_PIX_FORMAT_BGRA) glTexImage2D( AR_TEXTURE_RECTANGLE, 0, 3, gImXsize, gImYsize/size_adjust_factor, 0, GL_BGRA, GL_UNSIGNED_BYTE, image ); ! #elif defined(AR_PIX_FORMAT_BGR) glTexImage2D( AR_TEXTURE_RECTANGLE, 0, 3, gImXsize, gImYsize/size_adjust_factor, 0, GL_BGR, GL_UNSIGNED_BYTE, image ); ! #elif defined(AR_PIX_FORMAT_RGBA) glTexImage2D( AR_TEXTURE_RECTANGLE, 0, 3, gImXsize, gImYsize/size_adjust_factor, 0, GL_RGBA, GL_UNSIGNED_BYTE, image ); ! #elif defined(AR_PIX_FORMAT_RGB) glTexImage2D( AR_TEXTURE_RECTANGLE, 0, 3, gImXsize, gImYsize/size_adjust_factor, 0, GL_RGB, GL_UNSIGNED_BYTE, image ); ! #elif defined(AR_PIX_FORMAT_2vuy) glTexImage2D( AR_TEXTURE_RECTANGLE, 0, 3, gImXsize, gImYsize/size_adjust_factor, 0, GL_YCBCR_422_APPLE, GL_UNSIGNED_SHORT_8_8_REV_APPLE, image ); ! #elif defined(AR_PIX_FORMAT_yuvs) glTexImage2D( AR_TEXTURE_RECTANGLE, 0, 3, gImXsize, gImYsize/size_adjust_factor, 0, GL_YCBCR_422_APPLE, GL_UNSIGNED_SHORT_8_8_APPLE, image ); #else ! # error Unknown pixel format defined in config.h #endif old_size_adjust_factor = size_adjust_factor; --- 495,537 ---- glPixelStorei( GL_UNPACK_ROW_LENGTH, gImXsize*size_adjust_factor ); if( size_adjust_factor == old_size_adjust_factor ) { ! #if (AR_PIXEL_FORMAT_DEFAULT == AR_PIXEL_FORMAT_ARGB) glTexSubImage2D( AR_TEXTURE_RECTANGLE, 0, 0, 0, gImXsize, gImYsize/size_adjust_factor, GL_BGRA, GL_UNSIGNED_INT_8_8_8_8_REV, image ); ! #elif (AR_PIXEL_FORMAT_DEFAULT == AR_PIXEL_FORMAT_ABGR) glTexSubImage2D( AR_TEXTURE_RECTANGLE, 0, 0, 0, gImXsize, gImYsize/size_adjust_factor, GL_ABGR, GL_UNSIGNED_BYTE, image ); ! #elif (AR_PIXEL_FORMAT_DEFAULT == AR_PIXEL_FORMAT_BGRA) glTexSubImage2D( AR_TEXTURE_RECTANGLE, 0, 0, 0, gImXsize, gImYsize/size_adjust_factor, GL_BGRA, GL_UNSIGNED_BYTE, image ); ! #elif (AR_PIXEL_FORMAT_DEFAULT == AR_PIXEL_FORMAT_BGR) glTexSubImage2D( AR_TEXTURE_RECTANGLE, 0, 0, 0, gImXsize, gImYsize/size_adjust_factor, GL_BGR, GL_UNSIGNED_BYTE, image ); ! #elif (AR_PIXEL_FORMAT_DEFAULT == AR_PIXEL_FORMAT_RGBA) glTexSubImage2D( AR_TEXTURE_RECTANGLE, 0, 0, 0, gImXsize, gImYsize/size_adjust_factor, GL_RGBA, GL_UNSIGNED_BYTE, image ); ! #elif (AR_PIXEL_FORMAT_DEFAULT == AR_PIXEL_FORMAT_RGB) glTexSubImage2D( AR_TEXTURE_RECTANGLE, 0, 0, 0, gImXsize, gImYsize/size_adjust_factor, GL_RGB, GL_UNSIGNED_BYTE, image ); ! #elif (AR_PIXEL_FORMAT_DEFAULT == AR_PIXEL_FORMAT_2vuy) glTexSubImage2D( AR_TEXTURE_RECTANGLE, 0, 0, 0, gImXsize, gImYsize/size_adjust_factor, GL_YCBCR_422_APPLE, GL_UNSIGNED_SHORT_8_8_REV_APPLE, image ); ! #elif (AR_PIXEL_FORMAT_DEFAULT == AR_PIXEL_FORMAT_yuvs) glTexSubImage2D( AR_TEXTURE_RECTANGLE, 0, 0, 0, gImXsize, gImYsize/size_adjust_factor, GL_YCBCR_422_APPLE, GL_UNSIGNED_SHORT_8_8_APPLE, image ); #else ! # error Unknown default pixel format defined in config.h #endif } else { ! #if (AR_PIXEL_FORMAT_DEFAULT == AR_PIXEL_FORMAT_ARGB) glTexImage2D( AR_TEXTURE_RECTANGLE, 0, 3, gImXsize, gImYsize/size_adjust_factor, 0, GL_BGRA, GL_UNSIGNED_INT_8_8_8_8_REV, image ); ! #elif (AR_PIXEL_FORMAT_DEFAULT == AR_PIXEL_FORMAT_ABGR) glTexImage2D( AR_TEXTURE_RECTANGLE, 0, 3, gImXsize, gImYsize/size_adjust_factor, 0, GL_ABGR, GL_UNSIGNED_BYTE, image ); ! #elif (AR_PIXEL_FORMAT_DEFAULT == AR_PIXEL_FORMAT_BGRA) glTexImage2D( AR_TEXTURE_RECTANGLE, 0, 3, gImXsize, gImYsize/size_adjust_factor, 0, GL_BGRA, GL_UNSIGNED_BYTE, image ); ! #elif (AR_PIXEL_FORMAT_DEFAULT == AR_PIXEL_FORMAT_BGR) glTexImage2D( AR_TEXTURE_RECTANGLE, 0, 3, gImXsize, gImYsize/size_adjust_factor, 0, GL_BGR, GL_UNSIGNED_BYTE, image ); ! #elif (AR_PIXEL_FORMAT_DEFAULT == AR_PIXEL_FORMAT_RGBA) glTexImage2D( AR_TEXTURE_RECTANGLE, 0, 3, gImXsize, gImYsize/size_adjust_factor, 0, GL_RGBA, GL_UNSIGNED_BYTE, image ); ! #elif (AR_PIXEL_FORMAT_DEFAULT == AR_PIXEL_FORMAT_RGB) glTexImage2D( AR_TEXTURE_RECTANGLE, 0, 3, gImXsize, gImYsize/size_adjust_factor, 0, GL_RGB, GL_UNSIGNED_BYTE, image ); ! #elif (AR_PIXEL_FORMAT_DEFAULT == AR_PIXEL_FORMAT_2vuy) glTexImage2D( AR_TEXTURE_RECTANGLE, 0, 3, gImXsize, gImYsize/size_adjust_factor, 0, GL_YCBCR_422_APPLE, GL_UNSIGNED_SHORT_8_8_REV_APPLE, image ); ! #elif (AR_PIXEL_FORMAT_DEFAULT == AR_PIXEL_FORMAT_yuvs) glTexImage2D( AR_TEXTURE_RECTANGLE, 0, 3, gImXsize, gImYsize/size_adjust_factor, 0, GL_YCBCR_422_APPLE, GL_UNSIGNED_SHORT_8_8_APPLE, image ); #else ! # error Unknown default pixel format defined in config.h #endif old_size_adjust_factor = size_adjust_factor; *************** *** 625,631 **** #ifdef _WIN32 if( image == NULL ) { ! arMalloc(image,ARUint8,gImXsize*tex1Ysize*AR_PIX_SIZE); } ! memcpy(image, wimage, gImXsize*gImYsize*AR_PIX_SIZE); #endif --- 625,631 ---- #ifdef _WIN32 if( image == NULL ) { ! arMalloc(image,ARUint8,gImXsize*tex1Ysize*AR_PIX_SIZE_DEFAULT); } ! memcpy(image, wimage, gImXsize*gImYsize*AR_PIX_SIZE_DEFAULT); #endif *************** *** 661,703 **** if( size_adjust_factor == old_size_adjust_factor ) { ! #if defined(AR_PIX_FORMAT_ARGB) glTexSubImage2D( GL_TEXTURE_2D, 0, 0, 0, tex1Xsize1, tex1Ysize/size_adjust_factor, GL_BGRA, GL_UNSIGNED_INT_8_8_8_8_REV, image ); ! #elif defined(AR_PIX_FORMAT_ABGR) glTexSubImage2D( GL_TEXTURE_2D, 0, 0, 0, tex1Xsize1, tex1Ysize/size_adjust_factor, GL_ABGR, GL_UNSIGNED_BYTE, image ); ! #elif defined(AR_PIX_FORMAT_BGRA) glTexSubImage2D( GL_TEXTURE_2D, 0, 0, 0, tex1Xsize1, tex1Ysize/size_adjust_factor, GL_BGRA, GL_UNSIGNED_BYTE, image ); ! #elif defined(AR_PIX_FORMAT_BGR) glTexSubImage2D( GL_TEXTURE_2D, 0, 0, 0, tex1Xsize1, tex1Ysize/size_adjust_factor, GL_BGR, GL_UNSIGNED_BYTE, image ); ! #elif defined(AR_PIX_FORMAT_RGBA) glTexSubImage2D( GL_TEXTURE_2D, 0, 0, 0, tex1Xsize1, tex1Ysize/size_adjust_factor, GL_RGBA, GL_UNSIGNED_BYTE, image ); ! #elif defined(AR_PIX_FORMAT_RGB) glTexSubImage2D( GL_TEXTURE_2D, 0, 0, 0, tex1Xsize1, tex1Ysize/size_adjust_factor, GL_RGB, GL_UNSIGNED_BYTE, image ); ! #elif defined(AR_PIX_FORMAT_2vuy) glTexSubImage2D( GL_TEXTURE_2D, 0, 0, 0, tex1Xsize1, tex1Ysize/size_adjust_factor, GL_YCBCR_422_APPLE, GL_UNSIGNED_SHORT_8_8_REV_APPLE, image ); ! #elif defined(AR_PIX_FORMAT_yuvs) glTexSubImage2D( GL_TEXTURE_2D, 0, 0, 0, tex1Xsize1, tex1Ysize/size_adjust_factor, GL_YCBCR_422_APPLE, GL_UNSIGNED_SHORT_8_8_APPLE, image ); #else ! # error Unknown pixel format defined in config.h #endif } else { ! #if defined(AR_PIX_FORMAT_ARGB) glTexImage2D( GL_TEXTURE_2D, 0, 3, tex1Xsize1, tex1Ysize/size_adjust_factor, 0, GL_BGRA, GL_UNSIGNED_INT_8_8_8_8_REV, image ); ! #elif defined(AR_PIX_FORMAT_ABGR) glTexImage2D( GL_TEXTURE_2D, 0, 3, tex1Xsize1, tex1Ysize/size_adjust_factor, 0, GL_ABGR, GL_UNSIGNED_BYTE, image ); ! #elif defined(AR_PIX_FORMAT_BGRA) glTexImage2D( GL_TEXTURE_2D, 0, 3, tex1Xsize1, tex1Ysize/size_adjust_factor, 0, GL_BGRA, GL_UNSIGNED_BYTE, image ); ! #elif defined(AR_PIX_FORMAT_BGR) glTexImage2D( GL_TEXTURE_2D, 0, 3, tex1Xsize1, tex1Ysize/size_adjust_factor, 0, GL_BGR, GL_UNSIGNED_BYTE, image ); ! #elif defined(AR_PIX_FORMAT_RGBA) glTexImage2D( GL_TEXTURE_2D, 0, 3, tex1Xsize1, tex1Ysize/size_adjust_factor, 0, GL_RGBA, GL_UNSIGNED_BYTE, image ); ! #elif defined(AR_PIX_FORMAT_RGB) glTexImage2D( GL_TEXTURE_2D, 0, 3, tex1Xsize1, tex1Ysize/size_adjust_factor, 0, GL_RGB, GL_UNSIGNED_BYTE, image ); ! #elif defined(AR_PIX_FORMAT_2vuy) glTexImage2D( GL_TEXTURE_2D, 0, 3, tex1Xsize1, tex1Ysize/size_adjust_factor, 0, GL_YCBCR_422_APPLE, GL_UNSIGNED_SHORT_8_8_REV_APPLE, image ); ! #elif defined(AR_PIX_FORMAT_yuvs) glTexImage2D( GL_TEXTURE_2D, 0, 3, tex1Xsize1, tex1Ysize/size_adjust_factor, 0, GL_YCBCR_422_APPLE, GL_UNSIGNED_SHORT_8_8_APPLE, image ); #else ! # error Unknown pixel format defined in config.h #endif old_size_adjust_factor = size_adjust_factor; --- 661,703 ---- if( size_adjust_factor == old_size_adjust_factor ) { ! #if (AR_PIXEL_FORMAT_DEFAULT == AR_PIXEL_FORMAT_ARGB) glTexSubImage2D( GL_TEXTURE_2D, 0, 0, 0, tex1Xsize1, tex1Ysize/size_adjust_factor, GL_BGRA, GL_UNSIGNED_INT_8_8_8_8_REV, image ); ! #elif (AR_PIXEL_FORMAT_DEFAULT == AR_PIXEL_FORMAT_ABGR) glTexSubImage2D( GL_TEXTURE_2D, 0, 0, 0, tex1Xsize1, tex1Ysize/size_adjust_factor, GL_ABGR, GL_UNSIGNED_BYTE, image ); ! #elif (AR_PIXEL_FORMAT_DEFAULT == AR_PIXEL_FORMAT_BGRA) glTexSubImage2D( GL_TEXTURE_2D, 0, 0, 0, tex1Xsize1, tex1Ysize/size_adjust_factor, GL_BGRA, GL_UNSIGNED_BYTE, image ); ! #elif (AR_PIXEL_FORMAT_DEFAULT == AR_PIXEL_FORMAT_BGR) glTexSubImage2D( GL_TEXTURE_2D, 0, 0, 0, tex1Xsize1, tex1Ysize/size_adjust_factor, GL_BGR, GL_UNSIGNED_BYTE, image ); ! #elif (AR_PIXEL_FORMAT_DEFAULT == AR_PIXEL_FORMAT_RGBA) glTexSubImage2D( GL_TEXTURE_2D, 0, 0, 0, tex1Xsize1, tex1Ysize/size_adjust_factor, GL_RGBA, GL_UNSIGNED_BYTE, image ); ! #elif (AR_PIXEL_FORMAT_DEFAULT == AR_PIXEL_FORMAT_RGB) glTexSubImage2D( GL_TEXTURE_2D, 0, 0, 0, tex1Xsize1, tex1Ysize/size_adjust_factor, GL_RGB, GL_UNSIGNED_BYTE, image ); ! #elif (AR_PIXEL_FORMAT_DEFAULT == AR_PIXEL_FORMAT_2vuy) glTexSubImage2D( GL_TEXTURE_2D, 0, 0, 0, tex1Xsize1, tex1Ysize/size_adjust_factor, GL_YCBCR_422_APPLE, GL_UNSIGNED_SHORT_8_8_REV_APPLE, image ); ! #elif (AR_PIXEL_FORMAT_DEFAULT == AR_PIXEL_FORMAT_yuvs) glTexSubImage2D( GL_TEXTURE_2D, 0, 0, 0, tex1Xsize1, tex1Ysize/size_adjust_factor, GL_YCBCR_422_APPLE, GL_UNSIGNED_SHORT_8_8_APPLE, image ); #else ! # error Unknown default pixel format defined in config.h #endif } else { ! #if (AR_PIXEL_FORMAT_DEFAULT == AR_PIXEL_FORMAT_ARGB) glTexImage2D( GL_TEXTURE_2D, 0, 3, tex1Xsize1, tex1Ysize/size_adjust_factor, 0, GL_BGRA, GL_UNSIGNED_INT_8_8_8_8_REV, image ); ! #elif (AR_PIXEL_FORMAT_DEFAULT == AR_PIXEL_FORMAT_ABGR) glTexImage2D( GL_TEXTURE_2D, 0, 3, tex1Xsize1, tex1Ysize/size_adjust_factor, 0, GL_ABGR, GL_UNSIGNED_BYTE, image ); ! #elif (AR_PIXEL_FORMAT_DEFAULT == AR_PIXEL_FORMAT_BGRA) glTexImage2D( GL_TEXTURE_2D, 0, 3, tex1Xsize1, tex1Ysize/size_adjust_factor, 0, GL_BGRA, GL_UNSIGNED_BYTE, image ); ! #elif (AR_PIXEL_FORMAT_DEFAULT == AR_PIXEL_FORMAT_BGR) glTexImage2D( GL_TEXTURE_2D, 0, 3, tex1Xsize1, tex1Ysize/size_adjust_factor, 0, GL_BGR, GL_UNSIGNED_BYTE, image ); ! #elif (AR_PIXEL_FORMAT_DEFAULT == AR_PIXEL_FORMAT_RGBA) glTexImage2D( GL_TEXTURE_2D, 0, 3, tex1Xsize1, tex1Ysize/size_adjust_factor, 0, GL_RGBA, GL_UNSIGNED_BYTE, image ); ! #elif (AR_PIXEL_FORMAT_DEFAULT == AR_PIXEL_FORMAT_RGB) glTexImage2D( GL_TEXTURE_2D, 0, 3, tex1Xsize1, tex1Ysize/size_adjust_factor, 0, GL_RGB, GL_UNSIGNED_BYTE, image ); ! #elif (AR_PIXEL_FORMAT_DEFAULT == AR_PIXEL_FORMAT_2vuy) glTexImage2D( GL_TEXTURE_2D, 0, 3, tex1Xsize1, tex1Ysize/size_adjust_factor, 0, GL_YCBCR_422_APPLE, GL_UNSIGNED_SHORT_8_8_REV_APPLE, image ); ! #elif (AR_PIXEL_FORMAT_DEFAULT == AR_PIXEL_FORMAT_yuvs) glTexImage2D( GL_TEXTURE_2D, 0, 3, tex1Xsize1, tex1Ysize/size_adjust_factor, 0, GL_YCBCR_422_APPLE, GL_UNSIGNED_SHORT_8_8_APPLE, image ); #else ! # error Unknown default pixel format defined in config.h #endif old_size_adjust_factor = size_adjust_factor; *************** *** 814,820 **** #ifdef _WIN32 if( image == NULL ) { ! arMalloc(image,ARUint8,gImXsize*tex1Ysize*AR_PIX_SIZE); } ! memcpy(image, wimage, gImXsize*gImYsize*AR_PIX_SIZE); #endif --- 814,820 ---- #ifdef _WIN32 if( image == NULL ) { ! arMalloc(image,ARUint8,gImXsize*tex1Ysize*AR_PIX_SIZE_DEFAULT); } ! memcpy(image, wimage, gImXsize*gImYsize*AR_PIX_SIZE_DEFAULT); #endif *************** *** 850,892 **** if( size_adjust_factor == old_size_adjust_factor ) { ! #if defined(AR_PIX_FORMAT_ARGB) glTexSubImage2D( GL_TEXTURE_2D, 0, 0, 0, tex1Xsize1, tex1Ysize/size_adjust_factor, GL_BGRA, GL_UNSIGNED_INT_8_8_8_8_REV, image ); ! #elif defined(AR_PIX_FORMAT_ABGR) glTexSubImage2D( GL_TEXTURE_2D, 0, 0, 0, tex1Xsize1, tex1Ysize/size_adjust_factor, GL_ABGR, GL_UNSIGNED_BYTE, image ); ! #elif defined(AR_PIX_FORMAT_BGRA) glTexSubImage2D( GL_TEXTURE_2D, 0, 0, 0, tex1Xsize1, tex1Ysize/size_adjust_factor, GL_BGRA, GL_UNSIGNED_BYTE, image ); ! #elif defined(AR_PIX_FORMAT_BGR) glTexSubImage2D( GL_TEXTURE_2D, 0, 0, 0, tex1Xsize1, tex1Ysize/size_adjust_factor, GL_BGR, GL_UNSIGNED_BYTE, image ); ! #elif defined(AR_PIX_FORMAT_RGBA) glTexSubImage2D( GL_TEXTURE_2D, 0, 0, 0, tex1Xsize1, tex1Ysize/size_adjust_factor, GL_RGBA, GL_UNSIGNED_BYTE, image ); ! #elif defined(AR_PIX_FORMAT_RGB) glTexSubImage2D( GL_TEXTURE_2D, 0, 0, 0, tex1Xsize1, tex1Ysize/size_adjust_factor, GL_RGB, GL_UNSIGNED_BYTE, image ); ! #elif defined(AR_PIX_FORMAT_2vuy) glTexSubImage2D( GL_TEXTURE_2D, 0, 0, 0, tex1Xsize1, tex1Ysize/size_adjust_factor, GL_YCBCR_422_APPLE, GL_UNSIGNED_SHORT_8_8_REV_APPLE, image ); ! #elif defined(AR_PIX_FORMAT_yuvs) glTexSubImage2D( GL_TEXTURE_2D, 0, 0, 0, tex1Xsize1, tex1Ysize/size_adjust_factor, GL_YCBCR_422_APPLE, GL_UNSIGNED_SHORT_8_8_APPLE, image ); #else ! # error Unknown pixel format defined in config.h #endif } else { ! #if defined(AR_PIX_FORMAT_ARGB) glTexImage2D( GL_TEXTURE_2D, 0, 3, tex1Xsize1, tex1Ysize/size_adjust_factor, 0, GL_BGRA, GL_UNSIGNED_INT_8_8_8_8_REV, image ); ! #elif defined(AR_PIX_FORMAT_ABGR) glTexImage2D( GL_TEXTURE_2D, 0, 3, tex1Xsize1, tex1Ysize/size_adjust_factor, 0, GL_ABGR, GL_UNSIGNED_BYTE, image ); ! #elif defined(AR_PIX_FORMAT_BGRA) glTexImage2D( GL_TEXTURE_2D, 0, 3, tex1Xsize1, tex1Ysize/size_adjust_factor, 0, GL_BGRA, GL_UNSIGNED_BYTE, image ); ! #elif defined(AR_PIX_FORMAT_BGR) glTexImage2D( GL_TEXTURE_2D, 0, 3, tex1Xsize1, tex1Ysize/size_adjust_factor, 0, GL_BGR, GL_UNSIGNED_BYTE, image ); ! #elif defined(AR_PIX_FORMAT_RGBA) glTexImage2D( GL_TEXTURE_2D, 0, 3, tex1Xsize1, tex1Ysize/size_adjust_factor, 0, GL_RGBA, GL_UNSIGNED_BYTE, image ); ! #elif defined(AR_PIX_FORMAT_RGB) glTexImage2D( GL_TEXTURE_2D, 0, 3, tex1Xsize1, tex1Ysize/size_adjust_factor, 0, GL_RGB, GL_UNSIGNED_BYTE, image ); ! #elif defined(AR_PIX_FORMAT_2vuy) glTexImage2D( GL_TEXTURE_2D, 0, 3, tex1Xsize1, tex1Ysize/size_adjust_factor, 0, GL_YCBCR_422_APPLE, GL_UNSIGNED_SHORT_8_8_REV_APPLE, image ); ! #elif defined(AR_PIX_FORMAT_yuvs) glTexImage2D( GL_TEXTURE_2D, 0, 3, tex1Xsize1, tex1Ysize/size_adjust_factor, 0, GL_YCBCR_422_APPLE, GL_UNSIGNED_SHORT_8_8_APPLE, image ); #else ! # error Unknown pixel format defined in config.h #endif } --- 850,892 ---- if( size_adjust_factor == old_size_adjust_factor ) { ! #if (AR_PIXEL_FORMAT_DEFAULT == AR_PIXEL_FORMAT_ARGB) glTexSubImage2D( GL_TEXTURE_2D, 0, 0, 0, tex1Xsize1, tex1Ysize/size_adjust_factor, GL_BGRA, GL_UNSIGNED_INT_8_8_8_8_REV, image ); ! #elif (AR_PIXEL_FORMAT_DEFAULT == AR_PIXEL_FORMAT_ABGR) glTexSubImage2D( GL_TEXTURE_2D, 0, 0, 0, tex1Xsize1, tex1Ysize/size_adjust_factor, GL_ABGR, GL_UNSIGNED_BYTE, image ); ! #elif (AR_PIXEL_FORMAT_DEFAULT == AR_PIXEL_FORMAT_BGRA) glTexSubImage2D( GL_TEXTURE_2D, 0, 0, 0, tex1Xsize1, tex1Ysize/size_adjust_factor, GL_BGRA, GL_UNSIGNED_BYTE, image ); ! #elif (AR_PIXEL_FORMAT_DEFAULT == AR_PIXEL_FORMAT_BGR) glTexSubImage2D( GL_TEXTURE_2D, 0, 0, 0, tex1Xsize1, tex1Ysize/size_adjust_factor, GL_BGR, GL_UNSIGNED_BYTE, image ); ! #elif (AR_PIXEL_FORMAT_DEFAULT == AR_PIXEL_FORMAT_RGBA) glTexSubImage2D( GL_TEXTURE_2D, 0, 0, 0, tex1Xsize1, tex1Ysize/size_adjust_factor, GL_RGBA, GL_UNSIGNED_BYTE, image ); ! #elif (AR_PIXEL_FORMAT_DEFAULT == AR_PIXEL_FORMAT_RGB) glTexSubImage2D( GL_TEXTURE_2D, 0, 0, 0, tex1Xsize1, tex1Ysize/size_adjust_factor, GL_RGB, GL_UNSIGNED_BYTE, image ); ! #elif (AR_PIXEL_FORMAT_DEFAULT == AR_PIXEL_FORMAT_2vuy) glTexSubImage2D( GL_TEXTURE_2D, 0, 0, 0, tex1Xsize1, tex1Ysize/size_adjust_factor, GL_YCBCR_422_APPLE, GL_UNSIGNED_SHORT_8_8_REV_APPLE, image ); ! #elif (AR_PIXEL_FORMAT_DEFAULT == AR_PIXEL_FORMAT_yuvs) glTexSubImage2D( GL_TEXTURE_2D, 0, 0, 0, tex1Xsize1, tex1Ysize/size_adjust_factor, GL_YCBCR_422_APPLE, GL_UNSIGNED_SHORT_8_8_APPLE, image ); #else ! # error Unknown default pixel format defined in config.h #endif } else { ! #if (AR_PIXEL_FORMAT_DEFAULT == AR_PIXEL_FORMAT_ARGB) glTexImage2D( GL_TEXTURE_2D, 0, 3, tex1Xsize1, tex1Ysize/size_adjust_factor, 0, GL_BGRA, GL_UNSIGNED_INT_8_8_8_8_REV, image ); ! #elif (AR_PIXEL_FORMAT_DEFAULT == AR_PIXEL_FORMAT_ABGR) glTexImage2D( GL_TEXTURE_2D, 0, 3, tex1Xsize1, tex1Ysize/size_adjust_factor, 0, GL_ABGR, GL_UNSIGNED_BYTE, image ); ! #elif (AR_PIXEL_FORMAT_DEFAULT == AR_PIXEL_FORMAT_BGRA) glTexImage2D( GL_TEXTURE_2D, 0, 3, tex1Xsize1, tex1Ysize/size_adjust_factor, 0, GL_BGRA, GL_UNSIGNED_BYTE, image ); ! #elif (AR_PIXEL_FORMAT_DEFAULT == AR_PIXEL_FORMAT_BGR) glTexImage2D( GL_TEXTURE_2D, 0, 3, tex1Xsize1, tex1Ysize/size_adjust_factor, 0, GL_BGR, GL_UNSIGNED_BYTE, image ); ! #elif (AR_PIXEL_FORMAT_DEFAULT == AR_PIXEL_FORMAT_RGBA) glTexImage2D( GL_TEXTURE_2D, 0, 3, tex1Xsize1, tex1Ysize/size_adjust_factor, 0, GL_RGBA, GL_UNSIGNED_BYTE, image ); ! #elif (AR_PIXEL_FORMAT_DEFAULT == AR_PIXEL_FORMAT_RGB) glTexImage2D( GL_TEXTURE_2D, 0, 3, tex1Xsize1, tex1Ysize/size_adjust_factor, 0, GL_RGB, GL_UNSIGNED_BYTE, image ); ! #elif (AR_PIXEL_FORMAT_DEFAULT == AR_PIXEL_FORMAT_2vuy) glTexImage2D( GL_TEXTURE_2D, 0, 3, tex1Xsize1, tex1Ysize/size_adjust_factor, 0, GL_YCBCR_422_APPLE, GL_UNSIGNED_SHORT_8_8_REV_APPLE, image ); ! #elif (AR_PIXEL_FORMAT_DEFAULT == AR_PIXEL_FORMAT_yuvs) glTexImage2D( GL_TEXTURE_2D, 0, 3, tex1Xsize1, tex1Ysize/size_adjust_factor, 0, GL_YCBCR_422_APPLE, GL_UNSIGNED_SHORT_8_8_APPLE, image ); #else ! # error Unknown default pixel format defined in config.h #endif } *************** *** 979,1021 **** if( size_adjust_factor == old_size_adjust_factor ) { ! #if defined(AR_PIX_FORMAT_ARGB) ! glTexSubImage2D( GL_TEXTURE_2D, 0, 0, 0, tex1Xsize2, tex1Ysize/size_adjust_factor, GL_BGRA, GL_UNSIGNED_INT_8_8_8_8_REV, image+tex1Xsize1*AR_PIX_SIZE ); ! #elif defined(AR_PIX_FORMAT_ABGR) ! glTexSubImage2D( GL_TEXTURE_2D, 0, 0, 0, tex1Xsize2, tex1Ysize/size_adjust_factor, GL_ABGR, GL_UNSIGNED_BYTE, image+tex1Xsize1*AR_PIX_SIZE ); ! #elif defined(AR_PIX_FORMAT_BGRA) ! glTexSubImage2D( GL_TEXTURE_2D, 0, 0, 0, tex1Xsize2, tex1Ysize/size_adjust_factor, GL_BGRA, GL_UNSIGNED_BYTE, image+tex1Xsize1*AR_PIX_SIZE ); ! #elif defined(AR_PIX_FORMAT_BGR) ! glTexSubImage2D( GL_TEXTURE_2D, 0, 0, 0, tex1Xsize2, tex1Ysize/size_adjust_factor, GL_BGR, GL_UNSIGNED_BYTE, image+tex1Xsize1*AR_PIX_SIZE ); ! #elif defined(AR_PIX_FORMAT_RGBA) ! glTexSubImage2D( GL_TEXTURE_2D, 0, 0, 0, tex1Xsize2, tex1Ysize/size_adjust_factor, GL_RGBA, GL_UNSIGNED_BYTE, image+tex1Xsize1*AR_PIX_SIZE ); ! #elif defined(AR_PIX_FORMAT_RGB) ! glTexSubImage2D( GL_TEXTURE_2D, 0, 0, 0, tex1Xsize2, tex1Ysize/size_adjust_factor, GL_RGB, GL_UNSIGNED_BYTE, image+tex1Xsize1*AR_PIX_SIZE ); ! #elif defined(AR_PIX_FORMAT_2vuy) ! glTexSubImage2D( GL_TEXTURE_2D, 0, 0, 0, tex1Xsize2, tex1Ysize/size_adjust_factor, GL_YCBCR_422_APPLE, GL_UNSIGNED_SHORT_8_8_REV_APPLE, image+tex1Xsize1*AR_PIX_SIZE ); ! #elif defined(AR_PIX_FORMAT_yuvs) ! glTexSubImage2D( GL_TEXTURE_2D, 0, 0, 0, tex1Xsize2, tex1Ysize/size_adjust_factor, GL_YCBCR_422_APPLE, GL_UNSIGNED_SHORT_8_8_APPLE, image+tex1Xsize1*AR_PIX_SIZE ); #else ! # error Unknown pixel format defined in config.h #endif } else { ! #if defined(AR_PIX_FORMAT_ARGB) ! glTexImage2D( GL_TEXTURE_2D, 0, 3, tex1Xsize2, tex1Ysize/size_adjust_factor, 0, GL_BGRA, GL_UNSIGNED_INT_8_8_8_8_REV, image+tex1Xsize1*AR_PIX_SIZE ); ! #elif defined(AR_PIX_FORMAT_ABGR) ! glTexImage2D( GL_TEXTURE_2D, 0, 3, tex1Xsize2, tex1Ysize/size_adjust_factor, 0, GL_ABGR, GL_UNSIGNED_BYTE, image+tex1Xsize1*AR_PIX_SIZE ); ! #elif defined(AR_PIX_FORMAT_BGRA) ! glTexImage2D( GL_TEXTURE_2D, 0, 3, tex1Xsize2, tex1Ysize/size_adjust_factor, 0, GL_BGRA, GL_UNSIGNED_BYTE, image+tex1Xsize1*AR_PIX_SIZE ); ! #elif defined(AR_PIX_FORMAT_BGR) ! glTexImage2D( GL_TEXTURE_2D, 0, 3, tex1Xsize2, tex1Ysize/size_adjust_factor, 0, GL_BGR, GL_UNSIGNED_BYTE, image+tex1Xsize1*AR_PIX_SIZE ); ! #elif defined(AR_PIX_FORMAT_RGBA) ! glTexImage2D( GL_TEXTURE_2D, 0, 3, tex1Xsize2, tex1Ysize/size_adjust_factor, 0, GL_RGBA, GL_UNSIGNED_BYTE, image+tex1Xsize1*AR_PIX_SIZE ); ! #elif defined(AR_PIX_FORMAT_RGB) ! glTexImage2D( GL_TEXTURE_2D, 0, 3, tex1Xsize2, tex1Ysize/size_adjust_factor, 0, GL_RGB, GL_UNSIGNED_BYTE, image+tex1Xsize1*AR_PIX_SIZE ); ! #elif defined(AR_PIX_FORMAT_2vuy) ! glTexImage2D( GL_TEXTURE_2D, 0, 3, tex1Xsize2, tex1Ysize/size_adjust_factor, 0, GL_YCBCR_422_APPLE, GL_UNSIGNED_SHORT_8_8_REV_APPLE, image+tex1Xsize1*AR_PIX_SIZE ); ! #elif defined(AR_PIX_FORMAT_yuvs) ! glTexImage2D( GL_TEXTURE_2D, 0, 3, tex1Xsize2, tex1Ysize/size_adjust_factor, 0, GL_YCBCR_422_APPLE, GL_UNSIGNED_SHORT_8_8_APPLE, image+tex1Xsize1*AR_PIX_SIZE ); #else ! # error Unknown pixel format defined in config.h #endif old_size_adjust_factor = size_adjust_factor; --- 979,1021 ---- if( size_adjust_factor == old_size_adjust_factor ) { ! #if (AR_PIXEL_FORMAT_DEFAULT == AR_PIXEL_FORMAT_ARGB) ! glTexSubImage2D( GL_TEXTURE_2D, 0, 0, 0, tex1Xsize2, tex1Ysize/size_adjust_factor, GL_BGRA, GL_UNSIGNED_INT_8_8_8_8_REV, image+tex1Xsize1*AR_PIX_SIZE_DEFAULT ); ! #elif (AR_PIXEL_FORMAT_DEFAULT == AR_PIXEL_FORMAT_ABGR) ! glTexSubImage2D( GL_TEXTURE_2D, 0, 0, 0, tex1Xsize2, tex1Ysize/size_adjust_factor, GL_ABGR, GL_UNSIGNED_BYTE, image+tex1Xsize1*AR_PIX_SIZE_DEFAULT ); ! #elif (AR_PIXEL_FORMAT_DEFAULT == AR_PIXEL_FORMAT_BGRA) ! glTexSubImage2D( GL_TEXTURE_2D, 0, 0, 0, tex1Xsize2, tex1Ysize/size_adjust_factor, GL_BGRA, GL_UNSIGNED_BYTE, image+tex1Xsize1*AR_PIX_SIZE_DEFAULT ); ! #elif (AR_PIXEL_FORMAT_DEFAULT == AR_PIXEL_FORMAT_BGR) ! glTexSubImage2D( GL_TEXTURE_2D, 0, 0, 0, tex1Xsize2, tex1Ysize/size_adjust_factor, GL_BGR, GL_UNSIGNED_BYTE, image+tex1Xsize1*AR_PIX_SIZE_DEFAULT ); ! #elif (AR_PIXEL_FORMAT_DEFAULT == AR_PIXEL_FORMAT_RGBA) ! glTexSubImage2D( GL_TEXTURE_2D, 0, 0, 0, tex1Xsize2, tex1Ysize/size_adjust_factor, GL_RGBA, GL_UNSIGNED_BYTE, image+tex1Xsize1*AR_PIX_SIZE_DEFAULT ); ! #elif (AR_PIXEL_FORMAT_DEFAULT == AR_PIXEL_FORMAT_RGB) ! glTexSubImage2D( GL_TEXTURE_2D, 0, 0, 0, tex1Xsize2, tex1Ysize/size_adjust_factor, GL_RGB, GL_UNSIGNED_BYTE, image+tex1Xsize1*AR_PIX_SIZE_DEFAULT ); ! #elif (AR_PIXEL_FORMAT_DEFAULT == AR_PIXEL_FORMAT_2vuy) ! glTexSubImage2D( GL_TEXTURE_2D, 0, 0, 0, tex1Xsize2, tex1Ysize/size_adjust_factor, GL_YCBCR_422_APPLE, GL_UNSIGNED_SHORT_8_8_REV_APPLE, image+tex1Xsize1*AR_PIX_SIZE_DEFAULT ); ! #elif (AR_PIXEL_FORMAT_DEFAULT == AR_PIXEL_FORMAT_yuvs) ! glTexSubImage2D( GL_TEXTURE_2D, 0, 0, 0, tex1Xsize2, tex1Ysize/size_adjust_factor, GL_YCBCR_422_APPLE, GL_UNSIGNED_SHORT_8_8_APPLE, image+tex1Xsize1*AR_PIX_SIZE_DEFAULT ); #else ! # error Unknown default pixel format defined in config.h #endif } else { ! #if (AR_PIXEL_FORMAT_DEFAULT == AR_PIXEL_FORMAT_ARGB) ! glTexImage2D( GL_TEXTURE_2D, 0, 3, tex1Xsize2, tex1Ysize/size_adjust_factor, 0, GL_BGRA, GL_UNSIGNED_INT_8_8_8_8_REV, image+tex1Xsize1*AR_PIX_SIZE_DEFAULT ); ! #elif (AR_PIXEL_FORMAT_DEFAULT == AR_PIXEL_FORMAT_ABGR) ! glTexImage2D( GL_TEXTURE_2D, 0, 3, tex1Xsize2, tex1Ysize/size_adjust_factor, 0, GL_ABGR, GL_UNSIGNED_BYTE, image+tex1Xsize1*AR_PIX_SIZE_DEFAULT ); ! #elif (AR_PIXEL_FORMAT_DEFAULT == AR_PIXEL_FORMAT_BGRA) ! glTexImage2D( GL_TEXTURE_2D, 0, 3, tex1Xsize2, tex1Ysize/size_adjust_factor, 0, GL_BGRA, GL_UNSIGNED_BYTE, image+tex1Xsize1*AR_PIX_SIZE_DEFAULT ); ! #elif (AR_PIXEL_FORMAT_DEFAULT == AR_PIXEL_FORMAT_BGR) ! glTexImage2D( GL_TEXTURE_2D, 0, 3, tex1Xsize2, tex1Ysize/size_adjust_factor, 0, GL_BGR, GL_UNSIGNED_BYTE, image+tex1Xsize1*AR_PIX_SIZE_DEFAULT ); ! #elif (AR_PIXEL_FORMAT_DEFAULT == AR_PIXEL_FORMAT_RGBA) ! glTexImage2D( GL_TEXTURE_2D, 0, 3, tex1Xsize2, tex1Ysize/size_adjust_factor, 0, GL_RGBA, GL_UNSIGNED_BYTE, image+tex1Xsize1*AR_PIX_SIZE_DEFAULT ); ! #elif (AR_PIXEL_FORMAT_DEFAULT == AR_PIXEL_FORMAT_RGB) ! glTexImage2D( GL_TEXTURE_2D, 0, 3, tex1Xsize2, tex1Ysize/size_adjust_factor, 0, GL_RGB, GL_UNSIGNED_BYTE, image+tex1Xsize1*AR_PIX_SIZE_DEFAULT ); ! #elif (AR_PIXEL_FORMAT_DEFAULT == AR_PIXEL_FORMAT_2vuy) ! glTexImage2D( GL_TEXTURE_2D, 0, 3, tex1Xsize2, tex1Ysize/size_adjust_factor, 0, GL_YCBCR_422_APPLE, GL_UNSIGNED_SHORT_8_8_REV_APPLE, image+tex1Xsize1*AR_PIX_SIZE_DEFAULT ); ! #elif (AR_PIXEL_FORMAT_DEFAULT == AR_PIXEL_FORMAT_yuvs) ! glTexImage2D( GL_TEXTURE_2D, 0, 3, tex1Xsize2, tex1Ysize/size_adjust_factor, 0, GL_YCBCR_422_APPLE, GL_UNSIGNED_SHORT_8_8_APPLE, image+tex1Xsize1*AR_PIX_SIZE_DEFAULT ); #else ! # error Unknown default pixel format defined in config.h #endif old_size_adjust_factor = size_adjust_factor; *************** *** 1151,1172 **** glRasterPos3f( sx, sy, -1.0 ); ! #if defined(AR_PIX_FORMAT_ARGB) glDrawPixels( gImXsize/2, gImYsize/2, GL_BGRA, GL_UNSIGNED_INT_8_8_8_8_REV, image ); ! #elif defined(AR_PIX_FORMAT_ABGR) glDrawPixels( gImXsize/2, gImYsize/2, GL_ABGR, GL_UNSIGNED_BYTE, image ); ! #elif defined(AR_PIX_FORMAT_BGRA) glDrawPixels( gImXsize/2, gImYsize/2, GL_BGRA, GL_UNSIGNED_BYTE, image ); ! #elif defined(AR_PIX_FORMAT_BGR) glDrawPixels( gImXsize/2, gImYsize/2, GL_BGR, GL_UNSIGNED_BYTE, image ); ! #elif defined(AR_PIX_FORMAT_RGBA) glDrawPixels( gImXsize/2, gImYsize/2, GL_RGBA, GL_UNSIGNED_BYTE, image ); ! #elif defined(AR_PIX_FORMAT_RGB) glDrawPixels( gImXsize/2, gImYsize/2, GL_RGB, GL_UNSIGNED_BYTE, image ); ! #elif defined(AR_PIX_FORMAT_2vuy) glDrawPixels( gImXsize/2, gImYsize/2, GL_YCBCR_422_APPLE, GL_UNSIGNED_SHORT_8_8_REV_APPLE, image ); ! #elif defined(AR_PIX_FORMAT_yuvs) glDrawPixels( gImXsize/2, gImYsize/2, GL_YCBCR_422_APPLE, GL_UNSIGNED_SHORT_8_8_APPLE, image ); #else ! # error Unknown pixel format defined in config.h #endif } --- 1151,1172 ---- glRasterPos3f( sx, sy, -1.0 ); ! #if (AR_PIXEL_FORMAT_DEFAULT == AR_PIXEL_FORMAT_ARGB) glDrawPixels( gImXsize/2, gImYsize/2, GL_BGRA, GL_UNSIGNED_INT_8_8_8_8_REV, image ); ! #elif (AR_PIXEL_FORMAT_DEFAULT == AR_PIXEL_FORMAT_ABGR) glDrawPixels( gImXsize/2, gImYsize/2, GL_ABGR, GL_UNSIGNED_BYTE, image ); ! #elif (AR_PIXEL_FORMAT_DEFAULT == AR_PIXEL_FORMAT_BGRA) glDrawPixels( gImXsize/2, gImYsize/2, GL_BGRA, GL_UNSIGNED_BYTE, image ); ! #elif (AR_PIXEL_FORMAT_DEFAULT == AR_PIXEL_FORMAT_BGR) glDrawPixels( gImXsize/2, gImYsize/2, GL_BGR, GL_UNSIGNED_BYTE, image ); ! #elif (AR_PIXEL_FORMAT_DEFAULT == AR_PIXEL_FORMAT_RGBA) glDrawPixels( gImXsize/2, gImYsize/2, GL_RGBA, GL_UNSIGNED_BYTE, image ); ! #elif (AR_PIXEL_FORMAT_DEFAULT == AR_PIXEL_FORMAT_RGB) glDrawPixels( gImXsize/2, gImYsize/2, GL_RGB, GL_UNSIGNED_BYTE, image ); ! #elif (AR_PIXEL_FORMAT_DEFAULT == AR_PIXEL_FORMAT_2vuy) glDrawPixels( gImXsize/2, gImYsize/2, GL_YCBCR_422_APPLE, GL_UNSIGNED_SHORT_8_8_REV_APPLE, image ); ! #elif (AR_PIXEL_FORMAT_DEFAULT == AR_PIXEL_FORMAT_yuvs) glDrawPixels( gImXsize/2, gImYsize/2, GL_YCBCR_422_APPLE, GL_UNSIGNED_SHORT_8_8_APPLE, image ); #else ! # error Unknown default pixel format defined in config.h #endif } *************** *** 1203,1209 **** #ifdef _WIN32 if( image == NULL ) { ! arMalloc(image,ARUint8,tex2Xsize*tex2Ysize*AR_PIX_SIZE); } ! memcpy(image, wimage, gImXsize*gImYsize*AR_PIX_SIZE/4); #endif --- 1203,1209 ---- #ifdef _WIN32 if( image == NULL ) { ! arMalloc(image,ARUint8,tex2Xsize*tex2Ysize*AR_PIX_SIZE_DEFAULT); } ! memcpy(image, wimage, gImXsize*gImYsize*AR_PIX_SIZE_DEFAULT/4); #endif *************** *** 1230,1272 **** if( initf == 0 ) { ! #if defined(AR_PIX_FORMAT_ARGB) glTexSubImage2D( GL_TEXTURE_2D, 0, 0, 0, tex2Xsize, tex2Ysize, GL_BGRA, GL_UNSIGNED_INT_8_8_8_8_REV, image ); ! #elif defined(AR_PIX_FORMAT_ABGR) glTexSubImage2D( GL_TEXTURE_2D, 0, 0, 0, tex2Xsize, tex2Ysize, GL_ABGR, GL_UNSIGNED_BYTE, image ); ! #elif defined(AR_PIX_FORMAT_BGRA) glTexSubImage2D( GL_TEXTURE_2D, 0, 0, 0, tex2Xsize, tex2Ysize, GL_BGRA, GL_UNSIGNED_BYTE, image ); ! #elif defined(AR_PIX_FORMAT_BGR) glTexSubImage2D( GL_TEXTURE_2D, 0, 0, 0, tex2Xsize, tex2Ysize, GL_BGR, GL_UNSIGNED_BYTE, image ); ! #elif defined(AR_PIX_FORMAT_RGBA) glTexSubImage2D( GL_TEXTURE_2D, 0, 0, 0, tex2Xsize, tex2Ysize, GL_RGBA, GL_UNSIGNED_BYTE, image ); ! #elif defined(AR_PIX_FORMAT_RGB) glTexSubImage2D( GL_TEXTURE_2D, 0, 0, 0, tex2Xsize, tex2Ysize, GL_RGB, GL_UNSIGNED_BYTE, image ); ! #elif defined(AR_PIX_FORMAT_2vuy) glTexSubImage2D( GL_TEXTURE_2D, 0, 0, 0, tex2Xsize, tex2Ysize, GL_YCBCR_422_APPLE, GL_UNSIGNED_SHORT_8_8_REV_APPLE, image ); ! #elif defined(AR_PIX_FORMAT_yuvs) glTexSubImage2D( GL_TEXTURE_2D, 0, 0, 0, tex2Xsize, tex2Ysize, GL_YCBCR_422_APPLE, GL_UNSIGNED_SHORT_8_8_APPLE, image ); #else ! # error Unknown pixel format defined in config.h #endif } else { ! #if defined(AR_PIX_FORMAT_ARGB) glTexImage2D( GL_TEXTURE_2D, 0, 3, tex2Xsize, tex2Ysize, 0, GL_BGRA, GL_UNSIGNED_INT_8_8_8_8_REV, image ); ! #elif defined(AR_PIX_FORMAT_ABGR) glTexImage2D( GL_TEXTURE_2D, 0, 3, tex2Xsize, tex2Ysize, 0, GL_ABGR, GL_UNSIGNED_BYTE, image ); ! #elif defined(AR_PIX_FORMAT_BGRA) glTexImage2D( GL_TEXTURE_2D, 0, 3, tex2Xsize, tex2Ysize, 0, GL_BGRA, GL_UNSIGNED_BYTE, image ); ! #elif defined(AR_PIX_FORMAT_BGR) glTexImage2D( GL_TEXTURE_2D, 0, 3, tex2Xsize, tex2Ysize, 0, GL_BGR, GL_UNSIGNED_BYTE, image ); ! #elif defined(AR_PIX_FORMAT_RGBA) glTexImage2D( GL_TEXTURE_2D, 0, 3, tex2Xsize, tex2Ysize, 0, GL_RGBA, GL_UNSIGNED_BYTE, image ); ! #elif defined(AR_PIX_FORMAT_RGB) glTexImage2D( GL_TEXTURE_2D, 0, 3, tex2Xsize, tex2Ysize, 0, GL_RGB, GL_UNSIGNED_BYTE, image ); ! #elif defined(AR_PIX_FORMAT_2vuy) glTexImage2D( GL_TEXTURE_2D, 0, 3, tex2Xsize, tex2Ysize, 0, GL_YCBCR_422_APPLE, GL_UNSIGNED_SHORT_8_8_REV_APPLE, image ); ! #elif defined(AR_PIX_FORMAT_yuvs) glTexImage2D( GL_TEXTURE_2D, 0, 3, tex2Xsize, tex2Ysize, 0, GL_YCBCR_422_APPLE, GL_UNSIGNED_SHORT_8_8_APPLE, image ); #else ! # error Unknown pixel format defined in config.h #endif } --- 1230,1272 ---- if( initf == 0 ) { ! #if (AR_PIXEL_FORMAT_DEFAULT == AR_PIXEL_FORMAT_ARGB) glTexSubImage2D( GL_TEXTURE_2D, 0, 0, 0, tex2Xsize, tex2Ysize, GL_BGRA, GL_UNSIGNED_INT_8_8_8_8_REV, image ); ! #elif (AR_PIXEL_FORMAT_DEFAULT == AR_PIXEL_FORMAT_ABGR) glTexSubImage2D( GL_TEXTURE_2D, 0, 0, 0, tex2Xsize, tex2Ysize, GL_ABGR, GL_UNSIGNED_BYTE, image ); ! #elif (AR_PIXEL_FORMAT_DEFAULT == AR_PIXEL_FORMAT_BGRA) glTexSubImage2D( GL_TEXTURE_2D, 0, 0, 0, tex2Xsize, tex2Ysize, GL_BGRA, GL_UNSIGNED_BYTE, image ); ! #elif (AR_PIXEL_FORMAT_DEFAULT == AR_PIXEL_FORMAT_BGR) glTexSubImage2D( GL_TEXTURE_2D, 0, 0, 0, tex2Xsize, tex2Ysize, GL_BGR, GL_UNSIGNED_BYTE, image ); ! #elif (AR_PIXEL_FORMAT_DEFAULT == AR_PIXEL_FORMAT_RGBA) glTexSubImage2D( GL_TEXTURE_2D, 0, 0, 0, tex2Xsize, tex2Ysize, GL_RGBA, GL_UNSIGNED_BYTE, image ); ! #elif (AR_PIXEL_FORMAT_DEFAULT == AR_PIXEL_FORMAT_RGB) glTexSubImage2D( GL_TEXTURE_2D, 0, 0, 0, tex2Xsize, tex2Ysize, GL_RGB, GL_UNSIGNED_BYTE, image ); ! #elif (AR_PIXEL_FORMAT_DEFAULT == AR_PIXEL_FORMAT_2vuy) glTexSubImage2D( GL_TEXTURE_2D, 0, 0, 0, tex2Xsize, tex2Ysize, GL_YCBCR_422_APPLE, GL_UNSIGNED_SHORT_8_8_REV_APPLE, image ); ! #elif (AR_PIXEL_FORMAT_DEFAULT == AR_PIXEL_FORMAT_yuvs) glTexSubImage2D( GL_TEXTURE_2D, 0, 0, 0, tex2Xsize, tex2Ysize, GL_YCBCR_422_APPLE, GL_UNSIGNED_SHORT_8_8_APPLE, image ); #else ! # error Unknown default pixel format defined in config.h #endif } else { ! #if (AR_PIXEL_FORMAT_DEFAULT == AR_PIXEL_FORMAT_ARGB) glTexImage2D( GL_TEXTURE_2D, 0, 3, tex2Xsize, tex2Ysize, 0, GL_BGRA, GL_UNSIGNED_INT_8_8_8_8_REV, image ); ! #elif (AR_PIXEL_FORMAT_DEFAULT == AR_PIXEL_FORMAT_ABGR) glTexImage2D( GL_TEXTURE_2D, 0, 3, tex2Xsize, tex2Ysize, 0, GL_ABGR, GL_UNSIGNED_BYTE, image ); ! #elif (AR_PIXEL_FORMAT_DEFAULT == AR_PIXEL_FORMAT_BGRA) glTexImage2D( GL_TEXTURE_2D, 0, 3, tex2Xsize, tex2Ysize, 0, GL_BGRA, GL_UNSIGNED_BYTE, image ); ! #elif (AR_PIXEL_FORMAT_DEFAULT == AR_PIXEL_FORMAT_BGR) glTexImage2D( GL_TEXTURE_2D, 0, 3, tex2Xsize, tex2Ysize, 0, GL_BGR, GL_UNSIGNED_BYTE, image ); ! #elif (AR_PIXEL_FORMAT_DEFAULT == AR_PIXEL_FORMAT_RGBA) glTexImage2D( GL_TEXTURE_2D, 0, 3, tex2Xsize, tex2Ysize, 0, GL_RGBA, GL_UNSIGNED_BYTE, image ); ! #elif (AR_PIXEL_FORMAT_DEFAULT == AR_PIXEL_FORMAT_RGB) glTexImage2D( GL_TEXTURE_2D, 0, 3, tex2Xsize, tex2Ysize, 0, GL_RGB, GL_UNSIGNED_BYTE, image ); ! #elif (AR_PIXEL_FORMAT_DEFAULT == AR_PIXEL_FORMAT_2vuy) glTexImage2D( GL_TEXTURE_2D, 0, 3, tex2Xsize, tex2Ysize, 0, GL_YCBCR_422_APPLE, GL_UNSIGNED_SHORT_8_8_REV_APPLE, image ); ! #elif (AR_PIXEL_FORMAT_DEFAULT == AR_PIXEL_FORMAT_yuvs) glTexImage2D( GL_TEXTURE_2D, 0, 3, tex2Xsize, tex2Ysize, 0, GL_YCBCR_422_APPLE, GL_UNSIGNED_SHORT_8_8_APPLE, image ); #else ! # error Unknown default pixel format defined in config.h #endif } |
