[Piglit] [PATCH 02/23] texline: Remove test
Chad Versace
chad.versace at linux.intel.com
Thu Oct 4 17:16:21 PDT 2012
The texline test did not probe any pixels and was not listed in all.tests.
It was not a test at all.
This patch also removes directory tests/mesa, because the utility
functions defined there were only used by texline.
CC: Eric Anholt <eric at anholt.net>
Signed-off-by: Chad Versace <chad.versace at linux.intel.com>
---
This patch replaces
[PATCH 02/23] texline: Convert to use piglit framework
in my patch series.
tests/CMakeLists.txt | 4 -
tests/mesa/CMakeLists.txt | 3 -
tests/mesa/tests/CMakeLists.gl.txt | 24 --
tests/mesa/tests/CMakeLists.txt | 1 -
tests/mesa/tests/texline.c | 229 -------------------
tests/mesa/util/CMakeLists.gl.txt | 22 --
tests/mesa/util/CMakeLists.txt | 1 -
tests/mesa/util/readtex.c | 453 -------------------------------------
tests/mesa/util/readtex.h | 26 ---
tests/mesa/util/writeimg.c | 88 -------
tests/mesa/util/writeimg.h | 7 -
11 files changed, 858 deletions(-)
delete mode 100644 tests/mesa/CMakeLists.txt
delete mode 100644 tests/mesa/tests/CMakeLists.gl.txt
delete mode 100644 tests/mesa/tests/CMakeLists.txt
delete mode 100644 tests/mesa/tests/texline.c
delete mode 100644 tests/mesa/util/CMakeLists.gl.txt
delete mode 100644 tests/mesa/util/CMakeLists.txt
delete mode 100644 tests/mesa/util/readtex.c
delete mode 100644 tests/mesa/util/readtex.h
delete mode 100644 tests/mesa/util/writeimg.c
delete mode 100644 tests/mesa/util/writeimg.h
diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
index 64f38c5..ad904c5 100644
--- a/tests/CMakeLists.txt
+++ b/tests/CMakeLists.txt
@@ -28,7 +28,3 @@ ENDIF(OPENGL_egl_LIBRARY)
IF(BUILD_CL_TESTS)
add_subdirectory (cl)
ENDIF(BUILD_CL_TESTS)
-
-IF(${CMAKE_SYSTEM_NAME} MATCHES "Linux")
- add_subdirectory (mesa)
-ENDIF(${CMAKE_SYSTEM_NAME} MATCHES "Linux")
diff --git a/tests/mesa/CMakeLists.txt b/tests/mesa/CMakeLists.txt
deleted file mode 100644
index 5673128..0000000
--- a/tests/mesa/CMakeLists.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-
-add_subdirectory (util)
-add_subdirectory (tests)
diff --git a/tests/mesa/tests/CMakeLists.gl.txt b/tests/mesa/tests/CMakeLists.gl.txt
deleted file mode 100644
index ba95ce5..0000000
--- a/tests/mesa/tests/CMakeLists.gl.txt
+++ /dev/null
@@ -1,24 +0,0 @@
-include_directories(
- ${GLEXT_INCLUDE_DIR}
- ${OPENGL_INCLUDE_PATH}
- ${PNG_INCLUDE_DIR}
- ${piglit_SOURCE_DIR}/tests/mesa/util
-)
-
-link_libraries (
- ${OPENGL_gl_LIBRARY}
- ${OPENGL_glu_LIBRARY}
- ${PNG_LIBRARIES}
- mesautil
-)
-
-add_definitions (
- ${PNG_DEFINITIONS}
-)
-
-piglit_add_executable (texline texline.c)
-IF (UNIX)
- target_link_libraries (texline m)
-ENDIF (UNIX)
-
-# vim: ft=cmake:
diff --git a/tests/mesa/tests/CMakeLists.txt b/tests/mesa/tests/CMakeLists.txt
deleted file mode 100644
index 144a306..0000000
--- a/tests/mesa/tests/CMakeLists.txt
+++ /dev/null
@@ -1 +0,0 @@
-piglit_include_target_api()
diff --git a/tests/mesa/tests/texline.c b/tests/mesa/tests/texline.c
deleted file mode 100644
index 1c99953..0000000
--- a/tests/mesa/tests/texline.c
+++ /dev/null
@@ -1,229 +0,0 @@
-/* $Id: texline.c,v 1.5 2004/01/28 10:07:48 keithw Exp $ */
-
-/*
- * Test textured lines.
- *
- * Brian Paul
- * September 2000
- */
-
-
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <math.h>
-#include <GL/glut.h>
-#include "../util/readtex.h"
-#include "../util/writeimg.h"
-
-#define TEXTURE_FILE "mesa/girl.rgb"
-
-static int Width = 400, Height = 300;
-static int Automatic = 0;
-static const char* ScreenshotFile = 0;
-
-static void DoStar(int texture)
-{
- int l;
-
- glPushMatrix();
- glScalef(0.5, 0.5, 1.0);
- glTranslatef(1.0, 1.0, 0.0);
-
- glBegin(GL_LINES);
- for(l = 0; l < 30; ++l) {
- double rad = l*M_PI/15.0;
- double dx = cos(rad);
- double dy = sin(rad);
-
- if (texture >= 1)
- glTexCoord2f(l/30.0, 0.0);
- if (texture >= 2)
- glMultiTexCoord2fARB(GL_TEXTURE1_ARB, 0.0, l/30.0);
- if (texture == 0)
- glColor3f(0, 1, 0);
- glVertex2f(dx*0.2, dy*0.2);
-
- if (texture >= 1)
- glTexCoord2f(l/30.0, 1.0);
- if (texture >= 2)
- glMultiTexCoord2fARB(GL_TEXTURE1_ARB, 1.0, l/30.0);
- if (texture == 0)
- glColor3f(1, 0, 1);
- glVertex2f(dx*0.8, dy*0.8);
- }
- glEnd();
- glColor3f(1,1,1);
-
- glPopMatrix();
-}
-
-static void DoFrame(void)
-{
- int texture;
-
- glClearColor(0.0, 0.0, 0.0, 1.0);
- glClear(GL_COLOR_BUFFER_BIT);
-
- for(texture = 0; texture < 3; ++texture) {
- glPushMatrix();
- glTranslatef(0, texture, 0);
-
- if (texture == 0) {
- glActiveTextureARB(GL_TEXTURE0_ARB);
- glDisable(GL_TEXTURE_2D);
- glActiveTextureARB(GL_TEXTURE1_ARB);
- glDisable(GL_TEXTURE_2D);
- }
- else if (texture == 1) {
- glActiveTextureARB(GL_TEXTURE0_ARB);
- glEnable(GL_TEXTURE_2D);
- glActiveTextureARB(GL_TEXTURE1_ARB);
- glDisable(GL_TEXTURE_2D);
- }
- else {
- glActiveTextureARB(GL_TEXTURE0_ARB);
- glEnable(GL_TEXTURE_2D);
- glActiveTextureARB(GL_TEXTURE1_ARB);
- glEnable(GL_TEXTURE_2D);
- }
-
- glDisable(GL_LINE_SMOOTH);
- glDisable(GL_BLEND);
- glDisable(GL_LINE_STIPPLE);
- DoStar(texture);
-
- glTranslatef(1, 0, 0);
- glEnable(GL_LINE_STIPPLE);
- DoStar(texture);
-
- glTranslatef(1, 0, 0);
- glEnable(GL_LINE_SMOOTH);
- glEnable(GL_BLEND);
- glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
- glDisable(GL_LINE_STIPPLE);
- DoStar(texture);
-
- glTranslatef(1, 0, 0);
- glEnable(GL_LINE_STIPPLE);
- DoStar(texture);
-
- glPopMatrix();
- }
-
- glutSwapBuffers();
-}
-
-static void Screenshot(void)
-{
- GLubyte shot[400][300][3];
-
- glReadBuffer(GL_FRONT);
- glReadPixels(0, 0, 400, 300, GL_RGB, GL_UNSIGNED_BYTE, shot);
-
- WritePNGImage(ScreenshotFile, GL_RGB, 400, 300, (GLubyte*)shot, 1);
-}
-
-static void Display(void)
-{
- DoFrame();
- if (Automatic) {
- Screenshot();
- printf("PIGLIT: { }\n");
- exit(0);
- }
-}
-
-
-static void Reshape(int width, int height)
-{
- Width = width;
- Height = height;
- glViewport(0, 0, Width, Height);
- glMatrixMode(GL_PROJECTION);
- glLoadIdentity();
- glOrtho(0.0, 4.0, 0.0, 3.0, -1.0, 1.0);
- glMatrixMode( GL_MODELVIEW );
- glLoadIdentity();
-}
-
-
-static void Key( unsigned char key, int x, int y )
-{
- (void) x;
- (void) y;
- switch (key) {
- case 27:
- exit(0);
- break;
- }
-}
-
-
-static void Init( int argc, char *argv[] )
-{
- GLuint u;
- for (u = 0; u < 2; u++) {
- char filename[256];
-
- glActiveTextureARB(GL_TEXTURE0_ARB + u);
- glBindTexture(GL_TEXTURE_2D, 10+u);
- if (u == 0)
- glEnable(GL_TEXTURE_2D);
- glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR);
- glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR);
-
- if (u == 0)
- glTexEnvi(GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
- else
- glTexEnvi(GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_ADD);
-
- glPixelStorei(GL_UNPACK_ALIGNMENT, 1);
-
- if (getenv("DATADIR"))
- snprintf(filename, sizeof(filename), "%s/%s",
- getenv("DATADIR"), TEXTURE_FILE);
- else
- strcpy(filename, TEXTURE_FILE);
- if (!LoadRGBMipmaps(filename, GL_RGB)) {
- printf("Error: couldn't load texture image\n");
- if (Automatic)
- printf("PIGLIT: {'result': 'fail' }\n");
- exit(1);
- }
- }
-
- glLineStipple(1, 0xff);
-
- printf("GL_RENDERER = %s\n", (char *) glGetString(GL_RENDERER));
- printf("GL_VERSION = %s\n", (char *) glGetString(GL_VERSION));
- printf("GL_VENDOR = %s\n", (char *) glGetString(GL_VENDOR));
- printf("GL_EXTENSIONS = %s\n", (char *) glGetString(GL_EXTENSIONS));
-
- Reshape(Width, Height);
-}
-
-
-int main( int argc, char *argv[] )
-{
- glutInit( &argc, argv );
- if (argc == 3 && !strcmp(argv[1], "-auto")) {
- Automatic = 1;
- ScreenshotFile = argv[2];
- }
- glutInitWindowPosition(0, 0);
- glutInitWindowSize(Width, Height);
-
- glutInitDisplayMode(GLUT_RGB | GLUT_DOUBLE);
-
- glutCreateWindow("texline");
-
- Init(argc, argv);
-
- glutReshapeFunc(Reshape);
- glutKeyboardFunc(Key);
- glutDisplayFunc(Display);
-
- glutMainLoop();
- return 0;
-}
diff --git a/tests/mesa/util/CMakeLists.gl.txt b/tests/mesa/util/CMakeLists.gl.txt
deleted file mode 100644
index f55aa28..0000000
--- a/tests/mesa/util/CMakeLists.gl.txt
+++ /dev/null
@@ -1,22 +0,0 @@
-
-include_directories (
- ${GLEXT_INCLUDE_DIR}
- ${OPENGL_INCLUDE_PATH}
- ${PNG_INCLUDE_DIR}
-)
-link_libraries (
- piglitutil_${piglit_target_api}
- ${OPENGL_gl_LIBRARY}
- ${OPENGL_glu_LIBRARY}
- ${PNG_LIBRARIES}
-)
-add_definitions (
- ${PNG_DEFINITIONS}
-)
-
-piglit_add_library (mesautil
- readtex.c
- writeimg.c
-)
-
-# vim: ft=cmake:
diff --git a/tests/mesa/util/CMakeLists.txt b/tests/mesa/util/CMakeLists.txt
deleted file mode 100644
index 144a306..0000000
--- a/tests/mesa/util/CMakeLists.txt
+++ /dev/null
@@ -1 +0,0 @@
-piglit_include_target_api()
diff --git a/tests/mesa/util/readtex.c b/tests/mesa/util/readtex.c
deleted file mode 100644
index a792992..0000000
--- a/tests/mesa/util/readtex.c
+++ /dev/null
@@ -1,453 +0,0 @@
-/* readtex.c */
-
-/*
- * Read an SGI .rgb image file and generate a mipmap texture set.
- * Much of this code was borrowed from SGI's tk OpenGL toolkit.
- */
-
-
-
-#include "piglit-util-gl-common.h"
-#include <GL/gl.h>
-#include <GL/glu.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include "readtex.h"
-
-
-#ifndef SEEK_SET
-# define SEEK_SET 0
-#endif
-
-
-/*
-** RGB Image Structure
-*/
-
-typedef struct _TK_RGBImageRec {
- GLint sizeX, sizeY;
- GLint components;
- unsigned char *data;
-} TK_RGBImageRec;
-
-
-
-/******************************************************************************/
-
-typedef struct _rawImageRec {
- unsigned short imagic;
- unsigned short type;
- unsigned short dim;
- unsigned short sizeX, sizeY, sizeZ;
- unsigned long min, max;
- unsigned long wasteBytes;
- char name[80];
- unsigned long colorMap;
- FILE *file;
- unsigned char *tmp, *tmpR, *tmpG, *tmpB, *tmpA;
- unsigned long rleEnd;
- GLuint *rowStart;
- GLint *rowSize;
-} rawImageRec;
-
-/******************************************************************************/
-
-static void ConvertShort(unsigned short *array, long length)
-{
- unsigned long b1, b2;
- unsigned char *ptr;
-
- ptr = (unsigned char *)array;
- while (length--) {
- b1 = *ptr++;
- b2 = *ptr++;
- *array++ = (unsigned short) ((b1 << 8) | (b2));
- }
-}
-
-static void ConvertLong(GLuint *array, long length)
-{
- unsigned long b1, b2, b3, b4;
- unsigned char *ptr;
-
- ptr = (unsigned char *)array;
- while (length--) {
- b1 = *ptr++;
- b2 = *ptr++;
- b3 = *ptr++;
- b4 = *ptr++;
- *array++ = (b1 << 24) | (b2 << 16) | (b3 << 8) | (b4);
- }
-}
-
-static rawImageRec *RawImageOpen(const char *fileName)
-{
- union {
- int testWord;
- char testByte[4];
- } endianTest;
- rawImageRec *raw;
- GLenum swapFlag;
- int x;
-
- endianTest.testWord = 1;
- if (endianTest.testByte[0] == 1) {
- swapFlag = GL_TRUE;
- } else {
- swapFlag = GL_FALSE;
- }
-
- raw = (rawImageRec *)calloc(1, sizeof(rawImageRec));
- if (raw == NULL) {
- fprintf(stderr, "Out of memory!\n");
- return NULL;
- }
- if ((raw->file = fopen(fileName, "rb")) == NULL) {
- perror(fileName);
- return NULL;
- }
-
- fread(raw, 1, 12, raw->file);
-
- if (swapFlag) {
- ConvertShort(&raw->imagic, 6);
- }
-
- raw->tmp = (unsigned char *)malloc(raw->sizeX*256);
- raw->tmpR = (unsigned char *)malloc(raw->sizeX*256);
- raw->tmpG = (unsigned char *)malloc(raw->sizeX*256);
- raw->tmpB = (unsigned char *)malloc(raw->sizeX*256);
- if (raw->sizeZ==4) {
- raw->tmpA = (unsigned char *)malloc(raw->sizeX*256);
- }
- if (raw->tmp == NULL || raw->tmpR == NULL || raw->tmpG == NULL ||
- raw->tmpB == NULL) {
- fprintf(stderr, "Out of memory!\n");
- return NULL;
- }
-
- if ((raw->type & 0xFF00) == 0x0100) {
- x = raw->sizeY * raw->sizeZ * sizeof(GLuint);
- raw->rowStart = (GLuint *)malloc(x);
- raw->rowSize = (GLint *)malloc(x);
- if (raw->rowStart == NULL || raw->rowSize == NULL) {
- fprintf(stderr, "Out of memory!\n");
- return NULL;
- }
- raw->rleEnd = 512 + (2 * x);
- fseek(raw->file, 512, SEEK_SET);
- fread(raw->rowStart, 1, x, raw->file);
- fread(raw->rowSize, 1, x, raw->file);
- if (swapFlag) {
- ConvertLong(raw->rowStart, (long) (x/sizeof(GLuint)));
- ConvertLong((GLuint *)raw->rowSize, (long) (x/sizeof(GLint)));
- }
- }
- return raw;
-}
-
-static void RawImageClose(rawImageRec *raw)
-{
- fclose(raw->file);
- free(raw->tmp);
- free(raw->tmpR);
- free(raw->tmpG);
- free(raw->tmpB);
- if (raw->rowStart)
- free(raw->rowStart);
- if (raw->rowSize)
- free(raw->rowSize);
- if (raw->sizeZ>3) {
- free(raw->tmpA);
- }
- free(raw);
-}
-
-static void RawImageGetRow(rawImageRec *raw, unsigned char *buf, int y, int z)
-{
- unsigned char *iPtr, *oPtr, pixel;
- int count, done = 0;
-
- if ((raw->type & 0xFF00) == 0x0100) {
- fseek(raw->file, (long) raw->rowStart[y+z*raw->sizeY], SEEK_SET);
- fread(raw->tmp, 1, (unsigned int)raw->rowSize[y+z*raw->sizeY],
- raw->file);
-
- iPtr = raw->tmp;
- oPtr = buf;
- while (!done) {
- pixel = *iPtr++;
- count = (int)(pixel & 0x7F);
- if (!count) {
- done = 1;
- return;
- }
- if (pixel & 0x80) {
- while (count--) {
- *oPtr++ = *iPtr++;
- }
- } else {
- pixel = *iPtr++;
- while (count--) {
- *oPtr++ = pixel;
- }
- }
- }
- } else {
- fseek(raw->file, 512+(y*raw->sizeX)+(z*raw->sizeX*raw->sizeY),
- SEEK_SET);
- fread(buf, 1, raw->sizeX, raw->file);
- }
-}
-
-
-static void RawImageGetData(rawImageRec *raw, TK_RGBImageRec *final)
-{
- unsigned char *ptr;
- int i, j;
-
- final->data = (unsigned char *)malloc((raw->sizeX+1)*(raw->sizeY+1)*4);
- if (final->data == NULL) {
- fprintf(stderr, "Out of memory!\n");
- }
-
- ptr = final->data;
- for (i = 0; i < (int)(raw->sizeY); i++) {
- RawImageGetRow(raw, raw->tmpR, i, 0);
- RawImageGetRow(raw, raw->tmpG, i, 1);
- RawImageGetRow(raw, raw->tmpB, i, 2);
- if (raw->sizeZ>3) {
- RawImageGetRow(raw, raw->tmpA, i, 3);
- }
- for (j = 0; j < (int)(raw->sizeX); j++) {
- *ptr++ = *(raw->tmpR + j);
- *ptr++ = *(raw->tmpG + j);
- *ptr++ = *(raw->tmpB + j);
- if (raw->sizeZ>3) {
- *ptr++ = *(raw->tmpA + j);
- }
- }
- }
-}
-
-
-static TK_RGBImageRec *tkRGBImageLoad(const char *fileName)
-{
- rawImageRec *raw;
- TK_RGBImageRec *final;
-
- raw = RawImageOpen(fileName);
- if (!raw) {
- fprintf(stderr, "File not found\n");
- return NULL;
- }
- final = (TK_RGBImageRec *)malloc(sizeof(TK_RGBImageRec));
- if (final == NULL) {
- fprintf(stderr, "Out of memory!\n");
- return NULL;
- }
- final->sizeX = raw->sizeX;
- final->sizeY = raw->sizeY;
- final->components = raw->sizeZ;
- RawImageGetData(raw, final);
- RawImageClose(raw);
- return final;
-}
-
-
-static void FreeImage( TK_RGBImageRec *image )
-{
- free(image->data);
- free(image);
-}
-
-
-/*
- * Load an SGI .rgb file and generate a set of 2-D mipmaps from it.
- * Input: imageFile - name of .rgb to read
- * intFormat - internal texture format to use, or number of components
- * Return: GL_TRUE if success, GL_FALSE if error.
- */
-GLboolean LoadRGBMipmaps( const char *imageFile, GLint intFormat )
-{
- GLint w, h;
- return LoadRGBMipmaps2( imageFile, GL_TEXTURE_2D, intFormat, &w, &h );
-}
-
-
-
-GLboolean LoadRGBMipmaps2( const char *imageFile, GLenum target,
- GLint intFormat, GLint *width, GLint *height )
-{
- GLint error;
- GLenum format;
- TK_RGBImageRec *image;
-
- image = tkRGBImageLoad( imageFile );
- if (!image) {
- return GL_FALSE;
- }
-
- if (image->components==3) {
- format = GL_RGB;
- }
- else if (image->components==4) {
- format = GL_RGBA;
- }
- else {
- /* not implemented */
- fprintf(stderr,
- "Error in LoadRGBMipmaps %d-component images not implemented\n",
- image->components );
- return GL_FALSE;
- }
-
- error = gluBuild2DMipmaps( target,
- intFormat,
- image->sizeX, image->sizeY,
- format,
- GL_UNSIGNED_BYTE,
- image->data );
-
- *width = image->sizeX;
- *height = image->sizeY;
-
- FreeImage(image);
-
- return error ? GL_FALSE : GL_TRUE;
-}
-
-
-
-/*
- * Load an SGI .rgb file and return a pointer to the image data.
- * Input: imageFile - name of .rgb to read
- * Output: width - width of image
- * height - height of image
- * format - format of image (GL_RGB or GL_RGBA)
- * Return: pointer to image data or NULL if error
- */
-GLubyte *LoadRGBImage( const char *imageFile, GLint *width, GLint *height,
- GLenum *format )
-{
- TK_RGBImageRec *image;
- GLint bytes;
- GLubyte *buffer;
-
- image = tkRGBImageLoad( imageFile );
- if (!image) {
- return NULL;
- }
-
- if (image->components==3) {
- *format = GL_RGB;
- }
- else if (image->components==4) {
- *format = GL_RGBA;
- }
- else {
- /* not implemented */
- fprintf(stderr,
- "Error in LoadRGBImage %d-component images not implemented\n",
- image->components );
- return NULL;
- }
-
- *width = image->sizeX;
- *height = image->sizeY;
-
- bytes = image->sizeX * image->sizeY * image->components;
- buffer = (GLubyte *) malloc(bytes);
- if (!buffer)
- return NULL;
-
- memcpy( (void *) buffer, (void *) image->data, bytes );
-
- FreeImage(image);
-
- return buffer;
-}
-
-
-static void ConvertRGBtoYUV(GLint w, GLint h, GLint texel_bytes,
- const GLubyte *src,
- GLushort *dest)
-{
- GLint i, j;
-
- for (i = 0; i < h; i++) {
- for (j = 0; j < w; j++) {
- const GLfloat r = (src[0]) / 255.0;
- const GLfloat g = (src[1]) / 255.0;
- const GLfloat b = (src[2]) / 255.0;
- GLfloat y, cr, cb;
- GLint iy, icr, icb;
-
- y = r * 65.481 + g * 128.553 + b * 24.966 + 16;
- cb = r * -37.797 + g * -74.203 + b * 112.0 + 128;
- cr = r * 112.0 + g * -93.786 + b * -18.214 + 128;
- /*printf("%f %f %f -> %f %f %f\n", r, g, b, y, cb, cr);*/
- iy = (GLint) CLAMP(y, 0, 254);
- icb = (GLint) CLAMP(cb, 0, 254);
- icr = (GLint) CLAMP(cr, 0, 254);
-
- if (j & 1) {
- /* odd */
- *dest = (iy << 8) | icr;
- }
- else {
- /* even */
- *dest = (iy << 8) | icb;
- }
- dest++;
- src += texel_bytes;
- }
- }
-}
-
-
-/*
- * Load an SGI .rgb file and return a pointer to the image data, converted
- * to 422 yuv.
- *
- * Input: imageFile - name of .rgb to read
- * Output: width - width of image
- * height - height of image
- * Return: pointer to image data or NULL if error
- */
-GLushort *LoadYUVImage( const char *imageFile, GLint *width, GLint *height )
-{
- TK_RGBImageRec *image;
- GLushort *buffer;
-
- image = tkRGBImageLoad( imageFile );
- if (!image) {
- return NULL;
- }
-
- if (image->components != 3 && image->components !=4 ) {
- /* not implemented */
- fprintf(stderr,
- "Error in LoadYUVImage %d-component images not implemented\n",
- image->components );
- return NULL;
- }
-
- *width = image->sizeX;
- *height = image->sizeY;
-
- buffer = (GLushort *) malloc( image->sizeX * image->sizeY * 2 );
-
- if (buffer)
- ConvertRGBtoYUV( image->sizeX,
- image->sizeY,
- image->components,
- image->data,
- buffer );
-
-
- FreeImage(image);
- return buffer;
-}
-
diff --git a/tests/mesa/util/readtex.h b/tests/mesa/util/readtex.h
deleted file mode 100644
index 6c9a382..0000000
--- a/tests/mesa/util/readtex.h
+++ /dev/null
@@ -1,26 +0,0 @@
-/* readtex.h */
-
-#ifndef READTEX_H
-#define READTEX_H
-
-
-#include <GL/gl.h>
-
-
-extern GLboolean
-LoadRGBMipmaps( const char *imageFile, GLint intFormat );
-
-
-extern GLboolean
-LoadRGBMipmaps2( const char *imageFile, GLenum target,
- GLint intFormat, GLint *width, GLint *height );
-
-
-extern GLubyte *
-LoadRGBImage( const char *imageFile,
- GLint *width, GLint *height, GLenum *format );
-
-extern GLushort *
-LoadYUVImage( const char *imageFile, GLint *width, GLint *height );
-
-#endif
diff --git a/tests/mesa/util/writeimg.c b/tests/mesa/util/writeimg.c
deleted file mode 100644
index b243676..0000000
--- a/tests/mesa/util/writeimg.c
+++ /dev/null
@@ -1,88 +0,0 @@
-#include <unistd.h>
-#include <stdlib.h>
-#include <stdio.h>
-#include <string.h>
-#include <stdarg.h>
-
-#include <png.h>
-#include <GL/gl.h>
-
-static void abortf(const char * s, ...)
-{
- va_list args;
- va_start(args, s);
- vfprintf(stderr, s, args);
- fprintf(stderr, "\n");
- va_end(args);
- abort();
-}
-
-/**
- * Write RGB or RGBA data to a PNG file.
- * format must be GL_RGB or GL_RGBA.
- */
-void WritePNGImage(const char* filename,
- GLenum format, int width, int height, GLubyte* data, int reverse)
-{
- FILE* fp;
- png_structp png;
- png_infop info;
- int bytes;
- int colortype;
- int y;
- GLubyte* row;
-
- if (format == GL_RGBA) {
- colortype = PNG_COLOR_TYPE_RGB_ALPHA;
- bytes = 4;
- } else if (format == GL_RGB) {
- colortype = PNG_COLOR_TYPE_RGB;
- bytes = 3;
- } else {
- abortf("Unknown format %04x", format);
- }
-
- fp = fopen(filename, "wb");
- if (!fp)
- abortf("Failed to open %s", filename);
-
- png = png_create_write_struct(PNG_LIBPNG_VER_STRING, NULL, NULL, NULL);
- if (!png)
- abortf("png_create_write_struct failed");
-
- info = png_create_info_struct(png);
- if (!info)
- abortf("png_create_info_struct failed");
-
- if (setjmp(png_jmpbuf(png)))
- abortf("png_init_io failed");
-
- png_init_io(png, fp);
-
-
- /* write header */
- if (setjmp(png_jmpbuf(png)))
- abortf("Write error");
-
- png_set_IHDR(png, info, width, height,
- 8, colortype, PNG_INTERLACE_NONE,
- PNG_COMPRESSION_TYPE_BASE, PNG_FILTER_TYPE_BASE);
-
- png_write_info(png, info);
-
- if (reverse)
- row = data + (height*width*bytes);
- else
- row = data;
- for(y = 0; y < height; ++y) {
- if (reverse)
- row -= width*bytes;
- png_write_row(png, row);
- if (!reverse)
- row += width*bytes;
- }
-
- png_write_end(png, 0);
-
- fclose(fp);
-}
diff --git a/tests/mesa/util/writeimg.h b/tests/mesa/util/writeimg.h
deleted file mode 100644
index 5d173b5..0000000
--- a/tests/mesa/util/writeimg.h
+++ /dev/null
@@ -1,7 +0,0 @@
-#ifndef writeimg_h
-#define writeimg_h
-
-void WritePNGImage(const char* filename,
- GLenum format, int width, int height, GLubyte* data, int reverse);
-
-#endif /* writeimg_h */
--
1.7.11.4
More information about the Piglit
mailing list