From bf7d19a8052ee5ba0340ff596929c3e4b53240a8 Mon Sep 17 00:00:00 2001 From: Brad Hefta-Gaub Date: Tue, 25 Oct 2016 15:20:10 -0700 Subject: [PATCH] tweak format of gl_info --- interface/src/Application.cpp | 2 +- libraries/gl/src/gl/GLHelpers.cpp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/interface/src/Application.cpp b/interface/src/Application.cpp index f70685a8b2..6ebe997057 100644 --- a/interface/src/Application.cpp +++ b/interface/src/Application.cpp @@ -858,7 +858,7 @@ Application::Application(int& argc, char** argv, QElapsedTimer& startupTimer, bo { "gl_version_int", glVersionToInteger(glContextData.value("version").toString()) }, { "gl_version", glContextData["version"] }, { "gl_vender", glContextData["vendor"] }, - { "gl_sl_version", glContextData["slVersion"] }, + { "gl_sl_version", glContextData["sl_version"] }, { "gl_renderer", glContextData["renderer"] }, { "ideal_thread_count", QThread::idealThreadCount() } }; diff --git a/libraries/gl/src/gl/GLHelpers.cpp b/libraries/gl/src/gl/GLHelpers.cpp index 1604edccac..4091a0d0b6 100644 --- a/libraries/gl/src/gl/GLHelpers.cpp +++ b/libraries/gl/src/gl/GLHelpers.cpp @@ -45,7 +45,7 @@ QJsonObject getGLContextData() { result = QJsonObject { { "version", glVersion }, - { "slVersion", glslVersion }, + { "sl_version", glslVersion }, { "vendor", glVendor }, { "renderer", glRenderer }, };