From afd46741a1a86da1c5b5e4c33ea794caf77de88d Mon Sep 17 00:00:00 2001
From: Turo Lamminen <turotl@gmail.com>
Date: Tue, 02 Feb 2016 19:01:45 +0000
Subject: [PATCH] Remove MOJODDS_TEXTURE_NONE
---
glddstest.c | 6 +-----
mojodds.h | 1 -
afl-mojodds.c | 6 +-----
ddsinfo.c | 7 +------
4 files changed, 3 insertions(+), 17 deletions(-)
diff --git a/afl-mojodds.c b/afl-mojodds.c
index 8b5c1c7..4099171 100644
--- a/afl-mojodds.c
+++ b/afl-mojodds.c
@@ -55,7 +55,7 @@
unsigned long texlen = 0;
unsigned int glfmt = 0, w = 0, h = 0, miplevels = 0;
unsigned int cubemapfacelen = 0;
- MOJODDS_textureType textureType = MOJODDS_TEXTURE_NONE;
+ MOJODDS_textureType textureType = 0;
int retval = MOJODDS_getTexture(contents, size, &tex, &texlen, &glfmt, &w, &h, &miplevels, &cubemapfacelen, &textureType);
if (!retval) {
free(contents);
@@ -64,10 +64,6 @@
uint32_t hash = 0x12345678;
switch (textureType) {
- case MOJODDS_TEXTURE_NONE:
- assert(false); // this is not supposed to happen
- break;
-
case MOJODDS_TEXTURE_2D:
for (unsigned int miplevel = 0; miplevel < miplevels; miplevel++) {
const void *miptex = NULL;
diff --git a/ddsinfo.c b/ddsinfo.c
index a650227..dc9f54d 100644
--- a/ddsinfo.c
+++ b/ddsinfo.c
@@ -45,7 +45,7 @@
unsigned long texlen = 0;
unsigned int glfmt = 0, w = 0, h = 0, miplevels = 0;
unsigned int cubemapfacelen = 0;
- MOJODDS_textureType textureType = MOJODDS_TEXTURE_NONE;
+ MOJODDS_textureType textureType = 0;
int retval = MOJODDS_getTexture(contents, size, &tex, &texlen, &glfmt, &w, &h, &miplevels, &cubemapfacelen, &textureType);
if (!retval) {
printf("MOJODDS_getTexture failed\n");
@@ -61,11 +61,6 @@
printf("miplevels: %u\n", miplevels);
printf("textureType: ");
switch (textureType) {
- case MOJODDS_TEXTURE_NONE:
- printf("none (bug?)\n");
- return 4;
- break;
-
case MOJODDS_TEXTURE_2D:
printf("2D\n");
printf("\n");
diff --git a/glddstest.c b/glddstest.c
index 887a868..1f5aeb1 100644
--- a/glddstest.c
+++ b/glddstest.c
@@ -84,7 +84,7 @@
unsigned long texlen = 0;
unsigned int glfmt = 0, w = 0, h = 0, miplevels = 0;
unsigned int cubemapfacelen = 0;
- MOJODDS_textureType textureType = MOJODDS_TEXTURE_NONE;
+ MOJODDS_textureType textureType = 0;
int retval = MOJODDS_getTexture(contents, size, &tex, &texlen, &glfmt, &w, &h, &miplevels, &cubemapfacelen, &textureType);
if (!retval) {
printf("MOJODDS_getTexture failed\n");
@@ -115,10 +115,6 @@
glGenTextures(1, &texId);
switch (textureType) {
- case MOJODDS_TEXTURE_NONE:
- assert(false); // this is not supposed to happen
- break;
-
case MOJODDS_TEXTURE_2D:
glBindTexture(GL_TEXTURE_2D, texId);
diff --git a/mojodds.h b/mojodds.h
index 3f9adee..4bbaa48 100644
--- a/mojodds.h
+++ b/mojodds.h
@@ -8,7 +8,6 @@
typedef enum MOJODDS_textureType
{
- MOJODDS_TEXTURE_NONE,
MOJODDS_TEXTURE_2D,
MOJODDS_TEXTURE_CUBE,
MOJODDS_TEXTURE_VOLUME
--
Gitblit v1.9.3