Skip to content

Commit 1aa49e6

Browse files
committed
texture filter: oops, rename was not complete for some reason (Qt Creator fail)
1 parent 5ed736f commit 1aa49e6

1 file changed

Lines changed: 10 additions & 10 deletions

File tree

src/MacSrc/OpenGL.cc

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -129,27 +129,27 @@ static const float IdentityMatrix[] = {
129129

130130
static inline GLint get_texture_min_func() {
131131
// convert prefs texture filtering mode to GL min func value
132-
switch (gShockPrefs.textureFilter) {
132+
switch (gShockPrefs.doTextureFilter) {
133133
case 0: return GL_NEAREST;
134134
case 1: return GL_LINEAR;
135135
// case 2: return GL_LINEAR_MIPMAP_LINEAR;
136136
}
137137

138-
WARN("gShockPrefs.textureFilter=%d is invalid; resetting to zero (unflitered)", gShockPrefs.textureFilter);
139-
gShockPrefs.textureFilter = 0;
138+
WARN("gShockPrefs.doTextureFilter=%d is invalid; resetting to zero (unflitered)", gShockPrefs.doTextureFilter);
139+
gShockPrefs.doTextureFilter = 0;
140140
return GL_NEAREST;
141141
}
142142

143143
static inline GLint get_texture_mag_func() {
144144
// convert prefs texture filtering mode to GL mag func value
145-
switch (gShockPrefs.textureFilter) {
145+
switch (gShockPrefs.doTextureFilter) {
146146
case 0: return GL_NEAREST;
147147
case 1: return GL_LINEAR;
148148
case 2: return GL_LINEAR;
149149
}
150150

151-
WARN("gShockPrefs.textureFilter=%d is invalid; resetting to zero (unflitered)", gShockPrefs.textureFilter);
152-
gShockPrefs.textureFilter = 0;
151+
WARN("gShockPrefs.doTextureFilter=%d is invalid; resetting to zero (unflitered)", gShockPrefs.doTextureFilter);
152+
gShockPrefs.doTextureFilter = 0;
153153
return GL_NEAREST;
154154
}
155155

@@ -502,21 +502,21 @@ void opengl_swap_and_restore() {
502502

503503
void toggle_opengl() {
504504
if (gShockPrefs.doUseOpenGL) {
505-
switch (gShockPrefs.textureFilter) {
505+
switch (gShockPrefs.doTextureFilter) {
506506
case 0: {
507507
message_info("Switching to OpenGL bilinear rendering");
508-
gShockPrefs.textureFilter = 1;
508+
gShockPrefs.doTextureFilter = 1;
509509
} break;
510510
case 1: {
511511
message_info("Switching to sofware rendering");
512512
gShockPrefs.doUseOpenGL = false;
513-
gShockPrefs.textureFilter = 0;
513+
gShockPrefs.doTextureFilter = 0;
514514
} break;
515515
}
516516
} else {
517517
message_info("Switching to OpenGL unfiltered");
518518
gShockPrefs.doUseOpenGL = true;
519-
gShockPrefs.textureFilter = 0;
519+
gShockPrefs.doTextureFilter = 0;
520520
}
521521
SavePrefs();
522522
}

0 commit comments

Comments
 (0)