chore: minor code cull and warning clean up

This commit is contained in:
Hayden Kowalchuk 2019-08-17 17:53:14 -04:00
parent fca58f1f13
commit 28db49ed7f
4 changed files with 6 additions and 5 deletions

View File

@ -30,7 +30,7 @@ GLint APIENTRY gluScaleImage(GLenum format,
GLsizei dst_width, GLsizei dst_height, GLsizei dst_width, GLsizei dst_height,
GLenum dst_type, GLvoid *dst) GLenum dst_type, GLvoid *dst)
{ {
#if 0
/* Calculate the format that we need to convert the data to */ /* Calculate the format that we need to convert the data to */
GLuint dst_format = _determinePVRFormat(format, src_type); GLuint dst_format = _determinePVRFormat(format, src_type);
GLuint pvr_format = _determinePVRFormat(format, dst_type); GLuint pvr_format = _determinePVRFormat(format, dst_type);
@ -45,7 +45,7 @@ GLint APIENTRY gluScaleImage(GLenum format,
} else { } else {
return 0; return 0;
} }
#if 0
image = malloc(src_width * src_height * sizeof(pix_t)); image = malloc(src_width * src_height * sizeof(pix_t));
if (image == NULL) if (image == NULL)
return GLU_OUT_OF_MEMORY; return GLU_OUT_OF_MEMORY;
@ -71,7 +71,7 @@ GLint APIENTRY gluScaleImage(GLenum format,
dst_width); dst_width);
free(image); free(image);
#endif #endif
return 0; return GL_INVALID_VALUE;
} }
GLint APIENTRY gluBuild2DMipmaps( GLenum target,GLint internalFormat, GLsizei width, GLsizei height, GLint APIENTRY gluBuild2DMipmaps( GLenum target,GLint internalFormat, GLsizei width, GLsizei height,

View File

@ -7,7 +7,7 @@
static GLfloat SCENE_AMBIENT [] = {0.2, 0.2, 0.2, 1.0}; static GLfloat SCENE_AMBIENT [] = {0.2, 0.2, 0.2, 1.0};
static GLboolean VIEWER_IN_EYE_COORDINATES = GL_TRUE; static GLboolean VIEWER_IN_EYE_COORDINATES = GL_TRUE;
static GLenum COLOR_CONTROL = GL_SINGLE_COLOR; static GLenum COLOR_CONTROL = GL_SINGLE_COLOR;
static GLboolean TWO_SIDED_LIGHTING = GL_FALSE; //static GLboolean TWO_SIDED_LIGHTING = GL_FALSE;
static GLenum COLOR_MATERIAL_MODE = GL_AMBIENT_AND_DIFFUSE; static GLenum COLOR_MATERIAL_MODE = GL_AMBIENT_AND_DIFFUSE;
static LightSource LIGHTS[MAX_LIGHTS]; static LightSource LIGHTS[MAX_LIGHTS];

View File

@ -9,7 +9,7 @@
#define DEG2RAD (0.01745329251994329576923690768489) #define DEG2RAD (0.01745329251994329576923690768489)
/* Viewport mapping */ /* Viewport mapping */
static GLfloat gl_viewport_scale[3], gl_viewport_offset[3]; //static GLfloat gl_viewport_scale[3], gl_viewport_offset[3];
/* Depth range */ /* Depth range */
static GLclampf gl_depthrange_near, gl_depthrange_far; static GLclampf gl_depthrange_near, gl_depthrange_far;

View File

@ -1,4 +1,5 @@
#include <stdlib.h> #include <stdlib.h>
#include <stdio.h>
#include <math.h> #include <math.h>
#include <string.h> #include <string.h>
#include <assert.h> #include <assert.h>