[client] removed deprecated option to disable GL_ARB_buffer_storage

This commit is contained in:
Geoffrey McRae 2017-12-07 12:57:29 +11:00
parent 852309464f
commit ea5d0ddfe0

View File

@ -72,7 +72,6 @@ struct AppParams
int x, y; int x, y;
unsigned int w, h; unsigned int w, h;
const char * ivshmemSocket; const char * ivshmemSocket;
bool useBufferStorage;
bool useMipmap; bool useMipmap;
bool showFPS; bool showFPS;
bool useSpice; bool useSpice;
@ -96,7 +95,6 @@ struct AppParams params =
.w = 1024, .w = 1024,
.h = 768, .h = 768,
.ivshmemSocket = "/tmp/ivshmem_socket", .ivshmemSocket = "/tmp/ivshmem_socket",
.useBufferStorage = true,
.useMipmap = true, .useMipmap = true,
.showFPS = false, .showFPS = false,
.useSpice = true, .useSpice = true,
@ -768,17 +766,6 @@ int run()
return -1; return -1;
} }
SDL_GL_SetSwapInterval(params.vsync ? 1 : 0);
if (params.useBufferStorage)
{
const GLubyte * extensions = glGetString(GL_EXTENSIONS);
if (gluCheckExtension((const GLubyte *)"GL_ARB_buffer_storage", extensions))
{
DEBUG_INFO("Using GL_ARB_buffer_storage");
state.hasBufferStorage = true;
}
}
int shm_fd = 0; int shm_fd = 0;
SDL_Thread *t_ivshmem = NULL; SDL_Thread *t_ivshmem = NULL;
SDL_Thread *t_spice = NULL; SDL_Thread *t_spice = NULL;
@ -894,7 +881,6 @@ void doHelp(char * app)
" -j Disable cursor position scaling\n" " -j Disable cursor position scaling\n"
" -M Don't hide the host cursor\n" " -M Don't hide the host cursor\n"
"\n" "\n"
" -g Disable OpenGL 4.3 Buffer Storage (GL_ARB_buffer_storage)\n"
" -m Disable mipmapping\n" " -m Disable mipmapping\n"
" -v Disable VSync\n" " -v Disable VSync\n"
" -k Enable FPS display\n" " -k Enable FPS display\n"
@ -948,7 +934,7 @@ void doLicense()
int main(int argc, char * argv[]) int main(int argc, char * argv[])
{ {
int c; int c;
while((c = getopt(argc, argv, "hf:sc:p:jMgmvkanrdx:y:w:b:l")) != -1) while((c = getopt(argc, argv, "hf:sc:p:jMmvkanrdx:y:w:b:l")) != -1)
switch(c) switch(c)
{ {
case '?': case '?':
@ -981,10 +967,6 @@ int main(int argc, char * argv[])
params.hideMouse = false; params.hideMouse = false;
break; break;
case 'g':
params.useBufferStorage = false;
break;
case 'm': case 'm':
params.useMipmap = false; params.useMipmap = false;
break; break;