Merge branch 'master' of https://github.com/highfidelity/hifi into gputest

Conflicts:
	cmake/modules/Find3DConnexionClient.cmake
	interface/external/connexionclient/readme.txt
	interface/src/devices/3DConnexionClient.cpp
	interface/src/devices/3DConnexionClient.h

CMakeLists.txt

@@ -186,6 +186,7 @@ option(GET_POLYVOX "Get polyvox library automatically as external project" 1)
 option(GET_OPENVR "Get OpenVR library automatically as external project" 1)
 option(GET_BOOSTCONFIG "Get Boost-config library automatically as external project" 1)
 option(GET_OGLPLUS "Get OGLplus library automatically as external project" 1)
+option(GET_GLEW "Get GLEW library automatically as external project" 1)
 
 option(USE_NSIGHT "Attempt to find the nSight libraries" 1)
 

cmake/externals/glew/CMakeLists.txt

@@ -0,0 +1,34 @@
+set(EXTERNAL_NAME glew)
+
+if (ANDROID)
+  set(ANDROID_CMAKE_ARGS "-DCMAKE_TOOLCHAIN_FILE=${CMAKE_TOOLCHAIN_FILE}" "-DANDROID_NATIVE_API_LEVEL=19")
+endif ()
+
+include(ExternalProject)
+ExternalProject_Add(
+  ${EXTERNAL_NAME}
+  URL http://hifi-public.s3.amazonaws.com/dependencies/glew_simple.zip
+  URL_MD5 0507dc08337a82a5e7ecbc5417f92cc1
+  CONFIGURE_COMMAND CMAKE_ARGS ${ANDROID_CMAKE_ARGS} -DCMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE} -DCMAKE_INSTALL_PREFIX:PATH=<INSTALL_DIR>
+  LOG_DOWNLOAD 1
+  LOG_CONFIGURE 1
+  LOG_BUILD 1
+)
+
+# Hide this external target (for ide users)
+set_target_properties(${EXTERNAL_NAME} PROPERTIES FOLDER "hidden/externals")
+
+ExternalProject_Get_Property(${EXTERNAL_NAME} INSTALL_DIR)
+
+string(TOUPPER ${EXTERNAL_NAME} EXTERNAL_NAME_UPPER)
+set(${EXTERNAL_NAME_UPPER}_INCLUDE_DIRS ${INSTALL_DIR}/include CACHE PATH "List of glew include directories")
+
+if (UNIX)
+  set(LIB_PREFIX "lib")
+  set(LIB_EXT "a")
+elseif (WIN32)
+  set(LIB_EXT "lib")
+endif ()
+
+set(${EXTERNAL_NAME_UPPER}_LIBRARY_DEBUG ${INSTALL_DIR}/lib/${LIB_PREFIX}glew_d.${LIB_EXT} CACHE FILEPATH "Path to glew debug library")
+set(${EXTERNAL_NAME_UPPER}_LIBRARY_RELEASE ${INSTALL_DIR}/lib/${LIB_PREFIX}glew.${LIB_EXT} CACHE FILEPATH "Path to glew release library")

cmake/externals/zlib/CMakeLists.txt

@@ -0,0 +1,28 @@
+
+if (WIN32)
+  set(EXTERNAL_NAME zlib)
+  string(TOUPPER ${EXTERNAL_NAME} EXTERNAL_NAME_UPPER)
+
+  include(ExternalProject)
+  ExternalProject_Add(
+    ${EXTERNAL_NAME}
+    URL http://zlib.net/zlib128.zip
+    URL_MD5 126f8676442ffbd97884eb4d6f32afb4
+    INSTALL_COMMAND ""
+    LOG_DOWNLOAD 1
+  )
+
+  # Hide this external target (for ide users)
+  set_target_properties(${EXTERNAL_NAME} PROPERTIES FOLDER "hidden/externals")
+
+  ExternalProject_Get_Property(${EXTERNAL_NAME} SOURCE_DIR)
+
+  set(${EXTERNAL_NAME_UPPER}_INCLUDE_DIRS ${SOURCE_DIR}/include CACHE PATH "List of zlib include directories")
+
+  ExternalProject_Get_Property(${EXTERNAL_NAME} BINARY_DIR)
+
+  set(${EXTERNAL_NAME_UPPER}_DLL_PATH ${BINARY_DIR}/Release CACHE FILEPATH "Location of GLEW DLL")
+  set(${EXTERNAL_NAME_UPPER}_LIBRARY_RELEASE ${BINARY_DIR}/Release/zlib.lib CACHE FILEPATH "Location of ZLib release library")
+  set(${EXTERNAL_NAME_UPPER}_LIBRARY_DEBUG "" CACHE FILEPATH "Location of ZLib debug library")
+
+endif ()

cmake/modules/Find3DConnexionClient.cmake

@@ -15,39 +15,21 @@
 # 
 
 include("${MACRO_DIR}/HifiLibrarySearchHints.cmake")
-<<<<<<< HEAD
 hifi_library_search_hints("connexionclient")
 
-if (APPLE)
-  find_library(3DConnexionClient 3DConnexionClient)
-=======
-hifi_library_search_hints("3dconnexionclient")
-
 if (APPLE)
   find_library(3DCONNEXIONCLIENT_LIBRARIES NAMES 3DConnexionClient HINTS 3DCONNEXIONCLIENT_SEARCH_DIRS)
->>>>>>> 49be7c49b7a0e4b182902240b06ee61c883f651f
   if(EXISTS ${3DConnexionClient})
     set(3DCONNEXIONCLIENT_FOUND true)
     set(3DCONNEXIONCLIENT_INCLUDE_DIRS ${3DConnexionClient})
     set(3DCONNEXIONCLIENT_LIBRARY ${3DConnexionClient})
     message(STATUS "Found 3DConnexion at " ${3DConnexionClient})
-<<<<<<< HEAD
-    mark_as_advanced(3DCONNEXIONCLIENT_INCLUDE_DIR CONNEXIONCLIENT_LIBRARY)
-  else ()
-    message(STATUS "Could NOT find 3DConnexionClient")
-  endif()
-endif()
-
-if (WIN32)
-  find_path(3DCONNEXIONCLIENT_INCLUDE_DIRS I3dMouseParams.h PATH_SUFFIXES Inc HINTS ${CONNEXIONCLIENT_SEARCH_DIRS})
-=======
     mark_as_advanced(3DCONNEXIONCLIENT_INCLUDE_DIR 3DCONNEXIONCLIENT_LIBRARY)
   else ()
     message(STATUS "Could NOT find 3DConnexionClient")
   endif()
 elseif (WIN32)
   find_path(3DCONNEXIONCLIENT_INCLUDE_DIRS I3dMouseParams.h PATH_SUFFIXES include HINTS ${3DCONNEXIONCLIENT_SEARCH_DIRS})
->>>>>>> 49be7c49b7a0e4b182902240b06ee61c883f651f
 
   include(FindPackageHandleStandardArgs)
   find_package_handle_standard_args(3DConnexionClient DEFAULT_MSG 3DCONNEXIONCLIENT_INCLUDE_DIRS)

cmake/modules/FindGLEW.cmake

@@ -0,0 +1,35 @@
+#
+#  FindGLEW.cmake
+# 
+#  Try to find GLEW library and include path. Note that this only handles static GLEW.
+#  Once done this will define
+#
+#  GLEW_FOUND
+#  GLEW_INCLUDE_DIRS
+#  GLEW_LIBRARIES
+# 
+#  Created on 2/6/2014 by Stephen Birarda
+#  Copyright 2014 High Fidelity, Inc.
+#
+#  Adapted from FindGLEW.cmake available in the nvidia-texture-tools repository
+#  (https://code.google.com/p/nvidia-texture-tools/source/browse/trunk/cmake/FindGLEW.cmake?r=96)
+# 
+#  Distributed under the Apache License, Version 2.0.
+#  See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
+# 
+
+include("${MACRO_DIR}/HifiLibrarySearchHints.cmake")
+hifi_library_search_hints("glew")
+
+find_path(GLEW_INCLUDE_DIRS GL/glew.h PATH_SUFFIXES include HINTS ${GLEW_SEARCH_DIRS})
+
+find_library(GLEW_LIBRARY_RELEASE glew32 PATH_SUFFIXES "lib/Release/Win32" "lib" HINTS ${GLEW_SEARCH_DIRS})
+find_library(GLEW_LIBRARY_DEBUG glew32d PATH_SUFFIXES "lib/Debug/Win32" "lib" HINTS ${GLEW_SEARCH_DIRS})
+
+include(SelectLibraryConfigurations)
+select_library_configurations(GLEW)
+
+include(FindPackageHandleStandardArgs)
+find_package_handle_standard_args(GLEW DEFAULT_MSG GLEW_INCLUDE_DIRS GLEW_LIBRARIES)
+
+message(STATUS "Found GLEW - Assuming that GLEW is static and defining GLEW_STATIC")

interface/external/connexionclient/readme.txt

@@ -1,3 +0,0 @@
-The Mac version does not require any files.  The 3D Connexion driver should be installed from http://www.3dconnexion.eu/service/drivers.html
-
-For Windows the provided header file is required: Inc/I3dMouseParams.h

interface/src/Application.cpp

@@ -893,14 +893,15 @@ void Application::paintGL() {
         
         {
             float ratio = ((float)QApplication::desktop()->windowHandle()->devicePixelRatio() * getRenderResolutionScale());
-            auto mirrorViewport = glm::ivec4(0, 0, _mirrorViewRect.width() * ratio, _mirrorViewRect.height() * ratio);
+            // Flip the src and destination rect horizontally to do the mirror
-            auto mirrorViewportDest = mirrorViewport;
+            auto mirrorRect = glm::ivec4(0, 0, _mirrorViewRect.width() * ratio, _mirrorViewRect.height() * ratio);
+            auto mirrorRectDest = glm::ivec4(mirrorRect.z, mirrorRect.y, mirrorRect.x, mirrorRect.w);
             
             auto selfieFbo = DependencyManager::get<FramebufferCache>()->getSelfieFramebuffer();
             gpu::Batch batch;
             batch.setFramebuffer(selfieFbo);
             batch.clearColorFramebuffer(gpu::Framebuffer::BUFFER_COLOR0, glm::vec4(0.0f, 0.0f, 0.0f, 0.0f));
-            batch.blit(primaryFbo, mirrorViewport, selfieFbo, mirrorViewportDest);
+            batch.blit(primaryFbo, mirrorRect, selfieFbo, mirrorRectDest);
             batch.setFramebuffer(nullptr);
             renderArgs._context->render(batch);
         }
@@ -991,8 +992,14 @@ void Application::paintGL() {
             auto geometryCache = DependencyManager::get<GeometryCache>();
             auto primaryFbo = DependencyManager::get<FramebufferCache>()->getPrimaryFramebufferDepthColor();
             gpu::Batch batch;
-            batch.blit(primaryFbo, glm::ivec4(0, 0, _renderResolution.x, _renderResolution.y),
+
-                nullptr, glm::ivec4(0, 0, _glWidget->getDeviceSize().width(), _glWidget->getDeviceSize().height()));
+            if (renderArgs._renderMode == RenderArgs::MIRROR_RENDER_MODE) {
+                batch.blit(primaryFbo, glm::ivec4(0, 0, _renderResolution.x, _renderResolution.y),
+                    nullptr, glm::ivec4(_glWidget->getDeviceSize().width(), 0, 0, _glWidget->getDeviceSize().height()));
+            } else {
+                batch.blit(primaryFbo, glm::ivec4(0, 0, _renderResolution.x, _renderResolution.y),
+                    nullptr, glm::ivec4(0, 0, _glWidget->getDeviceSize().width(), _glWidget->getDeviceSize().height()));
+            }
 
             batch.setFramebuffer(nullptr);
 

interface/src/audio/AudioScope.cpp

@@ -137,7 +137,7 @@ void AudioScope::render(RenderArgs* renderArgs, int width, int height) {
     batch.setProjectionTransform(legacyProjection);
     batch.setModelTransform(Transform());
     batch.setViewTransform(Transform());
-    batch._glLineWidth(1.0f); // default
+
     geometryCache->renderQuad(batch, x, y, w, h, backgroundColor, _audioScopeBackground);
     geometryCache->renderGrid(batch, x, y, w, h, gridRows, gridCols, gridColor, _audioScopeGrid);
     renderLineStrip(batch, _inputID, inputColor, x, y, _samplesPerScope, _scopeInputOffset, _scopeInput);

interface/src/avatar/Head.cpp

@@ -397,7 +397,7 @@ void Head::renderLookatVectors(RenderArgs* renderArgs, glm::vec3 leftEyePosition
     auto& batch = *renderArgs->_batch;
     auto transform = Transform{};
     batch.setModelTransform(transform);
-    batch._glLineWidth(2.0f);
+    // FIXME: THe line width of 2.0f is not supported anymore, we ll need a workaround
 
     auto deferredLighting = DependencyManager::get<DeferredLightingEffect>();
     deferredLighting->bindSimpleProgram(batch);

interface/src/avatar/SkeletonModel.cpp

@@ -264,7 +264,8 @@ void SkeletonModel::renderJointConstraints(gpu::Batch& batch, int jointIndex) {
     const FBXGeometry& geometry = _geometry->getFBXGeometry();
     const float BASE_DIRECTION_SIZE = 0.3f;
     float directionSize = BASE_DIRECTION_SIZE * extractUniformScale(_scale);
-    batch._glLineWidth(3.0f);
+    // FIXME: THe line width of 3.0f is not supported anymore, we ll need a workaround
+
     do {
         const FBXJoint& joint = geometry.joints.at(jointIndex);
         const JointState& jointState = _rig->getJointState(jointIndex);

interface/src/devices/3DConnexionClient.cpp

@@ -160,11 +160,6 @@ ConnexionClient& ConnexionClient::getInstance() {
 
 #ifdef Q_OS_WIN
 
-<<<<<<< HEAD:interface/src/devices/3DConnexionClient.cpp
-static ConnexionClient* gMouseInput = 0;
-
-=======
->>>>>>> 49be7c49b7a0e4b182902240b06ee61c883f651f:interface/src/devices/3DConnexionClient.cpp
 void ConnexionClient::toggleConnexion(bool shouldEnable) {
     ConnexionData& connexiondata = ConnexionData::getInstance();
     if (shouldEnable && connexiondata.getDeviceID() == 0) {
@@ -178,26 +173,15 @@ void ConnexionClient::toggleConnexion(bool shouldEnable) {
 void ConnexionClient::init() {
     if (Menu::getInstance()->isOptionChecked(MenuOption::Connexion)) {
         fLast3dmouseInputTime = 0;
-<<<<<<< HEAD:interface/src/devices/3DConnexionClient.cpp
 
         InitializeRawInput(GetActiveWindow());
 
-        gMouseInput = &this;
-=======
-
-        InitializeRawInput(GetActiveWindow());
->>>>>>> 49be7c49b7a0e4b182902240b06ee61c883f651f:interface/src/devices/3DConnexionClient.cpp
-
         QAbstractEventDispatcher::instance()->installNativeEventFilter(this);
     }
 }
 
 void ConnexionClient::destroy() {
-<<<<<<< HEAD:interface/src/devices/3DConnexionClient.cpp
-    QAbstractEventDispatcher::instance()->removeNativeEventFilter(&this);
-=======
     QAbstractEventDispatcher::instance()->removeNativeEventFilter(this);
->>>>>>> 49be7c49b7a0e4b182902240b06ee61c883f651f:interface/src/devices/3DConnexionClient.cpp
     ConnexionData& connexiondata = ConnexionData::getInstance();
     int deviceid = connexiondata.getDeviceID();
     connexiondata.setDeviceID(0);
@@ -323,11 +307,7 @@ bool ConnexionClient::RawInputEventFilter(void* msg, long* result) {
 
     if (message->message == WM_INPUT) {
         HRAWINPUT hRawInput = reinterpret_cast<HRAWINPUT>(message->lParam);
-<<<<<<< HEAD:interface/src/devices/3DConnexionClient.cpp
-        gMouseInput->OnRawInput(RIM_INPUT, hRawInput);
-=======
         OnRawInput(RIM_INPUT, hRawInput);
->>>>>>> 49be7c49b7a0e4b182902240b06ee61c883f651f:interface/src/devices/3DConnexionClient.cpp
         if (result != 0) {
             result = 0;
         }
@@ -336,17 +316,6 @@ bool ConnexionClient::RawInputEventFilter(void* msg, long* result) {
     return false;
 }
 
-<<<<<<< HEAD:interface/src/devices/3DConnexionClient.cpp
-ConnexionClient::ConnexionClient() {
-
-}
-
-ConnexionClient::~ConnexionClient() {
-    QAbstractEventDispatcher::instance()->removeNativeEventFilter(&this);
-}
-
-=======
->>>>>>> 49be7c49b7a0e4b182902240b06ee61c883f651f:interface/src/devices/3DConnexionClient.cpp
 // Access the mouse parameters structure
 I3dMouseParam& ConnexionClient::MouseParams() {
     return f3dMouseParams;
@@ -824,13 +793,6 @@ MouseParameters::MouseParameters() :
     fIsRotate(true),
     fSpeed(SPEED_LOW)
 {
-<<<<<<< HEAD:interface/src/devices/3DConnexionClient.cpp
-}
-
-MouseParameters::~MouseParameters()
-{
-=======
->>>>>>> 49be7c49b7a0e4b182902240b06ee61c883f651f:interface/src/devices/3DConnexionClient.cpp
 }
 
 bool MouseParameters::IsPanZoom()  const {
@@ -902,13 +864,8 @@ static void DeviceRemovedHandler(unsigned int connection);
 static void MessageHandler(unsigned int connection, unsigned int messageType, void *messageArgument);
 
 void ConnexionClient::toggleConnexion(bool shouldEnable) {
-<<<<<<< HEAD:interface/src/devices/3DConnexionClient.cpp
-    if (shouldEnable && !ConnexionClient::Is3dmouseAttached()) {
-        ConnexionClient::init();
-=======
     if (shouldEnable && !Is3dmouseAttached()) {
         init();
->>>>>>> 49be7c49b7a0e4b182902240b06ee61c883f651f:interface/src/devices/3DConnexionClient.cpp
     }
     if (!shouldEnable && Is3dmouseAttached()) {
         destroy();

interface/src/devices/3DConnexionClient.h

@@ -85,22 +85,12 @@ private:
 class ConnexionClient : public QObject, public QAbstractNativeEventFilter {
     Q_OBJECT
 public:
-<<<<<<< HEAD:interface/src/devices/3DConnexionClient.h
-    ConnexionClient();
-    ~ConnexionClient();
-
-    static ConnexionClient& getInstance();
-    static void init();
-    static void destroy();
-    static bool Is3dmouseAttached();
-=======
     ConnexionClient() {};
 
     static ConnexionClient& getInstance();
     void init();
     void destroy();
     bool Is3dmouseAttached();
->>>>>>> 49be7c49b7a0e4b182902240b06ee61c883f651f:interface/src/devices/3DConnexionClient.h
     
     ConnexionClient* client;
 
@@ -173,15 +163,9 @@ class ConnexionClient : public QObject {
     Q_OBJECT
 public:
     static ConnexionClient& getInstance();
-<<<<<<< HEAD:interface/src/devices/3DConnexionClient.h
-    static void init();
-    static void destroy();
-    static bool Is3dmouseAttached();
-=======
     void init();
     void destroy();
     bool Is3dmouseAttached();
->>>>>>> 49be7c49b7a0e4b182902240b06ee61c883f651f:interface/src/devices/3DConnexionClient.h
 public slots:
     void toggleConnexion(bool shouldEnable);
 };

interface/src/ui/ApplicationOverlay.cpp

@@ -137,8 +137,7 @@ void ApplicationOverlay::renderAudioScope(RenderArgs* renderArgs) {
     batch.setProjectionTransform(legacyProjection);
     batch.setModelTransform(Transform());
     batch.setViewTransform(Transform());
-    batch._glLineWidth(1.0f); // default
+
-    
     // Render the audio scope
     DependencyManager::get<AudioScope>()->render(renderArgs, width, height);
 }
@@ -157,8 +156,7 @@ void ApplicationOverlay::renderOverlays(RenderArgs* renderArgs) {
     batch.setProjectionTransform(legacyProjection);
     batch.setModelTransform(Transform());
     batch.setViewTransform(Transform());
-    batch._glLineWidth(1.0f); // default
+
-    
     // Render all of the Script based "HUD" aka 2D overlays.
     // note: we call them HUD, as opposed to 2D, only because there are some cases of 3D HUD overlays, like the
     // cameral controls for the edit.js
@@ -195,6 +193,7 @@ void ApplicationOverlay::renderRearView(RenderArgs* renderArgs) {
         glm::vec2 texCoordMinCorner(0.0f, 0.0f);
         glm::vec2 texCoordMaxCorner(viewport.width() * renderRatio / float(selfieTexture->getWidth()), viewport.height() * renderRatio / float(selfieTexture->getHeight()));
 
+
         geometryCache->useSimpleDrawPipeline(batch, true);
         batch.setResourceTexture(0, selfieTexture);
         geometryCache->renderQuad(batch, bottomLeft, topRight, texCoordMinCorner, texCoordMaxCorner, glm::vec4(1.0f, 1.0f, 1.0f, 1.0f)); 
@@ -247,7 +246,7 @@ void ApplicationOverlay::renderDomainConnectionStatusBorder(RenderArgs* renderAr
         batch.setModelTransform(Transform());
         batch.setViewTransform(Transform());
         batch.setResourceTexture(0, DependencyManager::get<TextureCache>()->getWhiteTexture());
-        batch._glLineWidth(CONNECTION_STATUS_BORDER_LINE_WIDTH);
+        // FIXME: THe line width of CONNECTION_STATUS_BORDER_LINE_WIDTH is not supported anymore, we ll need a workaround
 
         // TODO animate the disconnect border for some excitement while not connected?
         //double usecs = usecTimestampNow();

interface/src/ui/overlays/Circle3DOverlay.cpp

@@ -101,8 +101,9 @@ void Circle3DOverlay::render(RenderArgs* args) {
     
     Q_ASSERT(args->_batch);
     auto& batch = *args->_batch;
-    batch._glLineWidth(_lineWidth);
+
-    
+    // FIXME: THe line width of _lineWidth is not supported anymore, we ll need a workaround
+
     auto transform = _transform;
     transform.postScale(glm::vec3(getDimensions(), 1.0f));
     batch.setModelTransform(transform);

interface/src/ui/overlays/Grid3DOverlay.cpp

@@ -60,7 +60,6 @@ void Grid3DOverlay::render(RenderArgs* args) {
 
         // Minor grid
         {
-            batch->_glLineWidth(1.0f);
             auto position = glm::vec3(_minorGridWidth * (floorf(rotated.x / spacing) - MINOR_GRID_DIVISIONS / 2),
                                       spacing * (floorf(rotated.y / spacing) - MINOR_GRID_DIVISIONS / 2),
                                       getPosition().z);
@@ -76,7 +75,6 @@ void Grid3DOverlay::render(RenderArgs* args) {
 
         // Major grid
         {
-            batch->_glLineWidth(4.0f);
             spacing *= _majorGridEvery;
             auto position = glm::vec3(spacing * (floorf(rotated.x / spacing) - MAJOR_GRID_DIVISIONS / 2),
                                       spacing * (floorf(rotated.y / spacing) - MAJOR_GRID_DIVISIONS / 2),
@@ -86,6 +84,8 @@ void Grid3DOverlay::render(RenderArgs* args) {
             transform.setTranslation(position);
             transform.setScale(scale);
 
+            // FIXME: THe line width of 4.0f is not supported anymore, we ll need a workaround
+
             batch->setModelTransform(transform);
 
             DependencyManager::get<GeometryCache>()->renderGrid(*batch, MAJOR_GRID_DIVISIONS, MAJOR_GRID_DIVISIONS, gridColor);

interface/src/ui/overlays/Overlays.cpp

@@ -119,7 +119,6 @@ void Overlays::renderHUD(RenderArgs* renderArgs) {
         batch.setProjectionTransform(legacyProjection);
         batch.setModelTransform(Transform());
         batch.setViewTransform(Transform());
-        batch._glLineWidth(1.0f); // default
 
         thisOverlay->render(renderArgs);
     }

libraries/entities-renderer/src/RenderableLineEntityItem.cpp

@@ -46,13 +46,11 @@ void RenderableLineEntityItem::render(RenderArgs* args) {
     transform.setTranslation(getPosition());
     transform.setRotation(getRotation());
     batch.setModelTransform(transform);
-    
+
-    batch._glLineWidth(getLineWidth());
     if (getLinePoints().size() > 1) {
         DependencyManager::get<DeferredLightingEffect>()->bindSimpleProgram(batch);
         DependencyManager::get<GeometryCache>()->renderVertices(batch, gpu::LINE_STRIP, _lineVerticesID);
     }
-    batch._glLineWidth(1.0f);
+
-    
     RenderableDebugableEntityItem::render(this, args);
 };

libraries/gpu/CMakeLists.txt

@@ -7,15 +7,18 @@ setup_hifi_library()
 
 link_hifi_libraries(shared)
 
+add_dependency_external_projects(glew)
+find_package(GLEW REQUIRED)
+add_definitions(-DGLEW_STATIC) 
+target_include_directories(${TARGET_NAME} PUBLIC ${GLEW_INCLUDE_DIRS})
+target_link_libraries(${TARGET_NAME} ${GLEW_LIBRARY})
+
 if (APPLE)
   # link in required OS X frameworks and include the right GL headers
   find_library(OpenGL OpenGL)
-
   target_link_libraries(${TARGET_NAME} ${OpenGL})
 elseif (WIN32)
-  add_definitions(-DGLEW_STATIC) 
+  target_link_libraries(${TARGET_NAME} ${GLEW_LIBRARY} opengl32.lib)
-
-  target_link_libraries(${TARGET_NAME} opengl32.lib)
 
   if (USE_NSIGHT)
     # try to find the Nsight package and add it to the build if we find it
@@ -38,5 +41,4 @@ else ()
   endif ()
 
   target_link_libraries(${TARGET_NAME} "${OPENGL_LIBRARY}")
-
 endif (APPLE)

libraries/gpu/src/gpu/Batch.h

@@ -106,7 +106,10 @@ public:
     void clearStencilFramebuffer(int stencil, bool enableScissor = false); // not a command, just a shortcut for clearFramebuffer, it touches only stencil target
     void clearDepthStencilFramebuffer(float depth, int stencil, bool enableScissor = false); // not a command, just a shortcut for clearFramebuffer, it touches depth and stencil target
 
-    void blit(const FramebufferPointer& src, const Vec4i& srcViewport, const FramebufferPointer& dst, const Vec4i& dstViewport);
+    // Blit src framebuffer to destination
+    // the srcRect and dstRect are the rect region in source and destination framebuffers expressed in pixel space
+    // with xy and zw the bounding corners of the rect region.
+    void blit(const FramebufferPointer& src, const Vec4i& srcRect, const FramebufferPointer& dst, const Vec4i& dstRect);
 
     // Query Section
     void beginQuery(const QueryPointer& query);
@@ -134,7 +137,6 @@ public:
     void _glUniformMatrix4fv(int location, int count, unsigned char transpose, const float* value);
 
     void _glColor4f(float red, float green, float blue, float alpha);
-    void _glLineWidth(float width);
 
     enum Command {
         COMMAND_draw = 0,
@@ -183,7 +185,6 @@ public:
         COMMAND_glUniformMatrix4fv,
 
         COMMAND_glColor4f,
-        COMMAND_glLineWidth,
 
         NUM_COMMANDS,
     };

libraries/gpu/src/gpu/GLBackend.cpp

@@ -60,7 +60,6 @@ GLBackend::CommandCall GLBackend::_commandCalls[Batch::NUM_COMMANDS] =
     (&::gpu::GLBackend::do_glUniformMatrix4fv),
 
     (&::gpu::GLBackend::do_glColor4f),
-    (&::gpu::GLBackend::do_glLineWidth),
 };
 
 void GLBackend::init() {
@@ -496,16 +495,3 @@ void GLBackend::do_glColor4f(Batch& batch, uint32 paramOffset) {
         batch._params[paramOffset + 0]._float);
     (void) CHECK_GL_ERROR();
 }
-
-void Batch::_glLineWidth(GLfloat width) {
-    ADD_COMMAND_GL(glLineWidth);
-    
-    _params.push_back(width);
-    
-    DO_IT_NOW(_glLineWidth, 1);
-}
-void GLBackend::do_glLineWidth(Batch& batch, uint32 paramOffset) {
-    // FIXME CORE
-    //glLineWidth(batch._params[paramOffset]._float);
-    (void) CHECK_GL_ERROR();
-}

libraries/gpu/src/gpu/GLBackend.h

@@ -336,7 +336,7 @@ protected:
     // Uniform Stage
     void do_setUniformBuffer(Batch& batch, uint32 paramOffset);
 
-    void releaseUniformBuffer(int slot);
+    void releaseUniformBuffer(uint32_t slot);
     void resetUniformStage();
     struct UniformStageState {
         Buffers _buffers;
@@ -349,7 +349,7 @@ protected:
     // Resource Stage
     void do_setResourceTexture(Batch& batch, uint32 paramOffset);
     
-    void releaseResourceTexture(int slot);
+    void releaseResourceTexture(uint32_t slot);
     void resetResourceStage();
     struct ResourceStageState {
         Textures _textures;
@@ -445,7 +445,6 @@ protected:
     void do_glUniformMatrix4fv(Batch& batch, uint32 paramOffset);
 
     void do_glColor4f(Batch& batch, uint32 paramOffset);
-    void do_glLineWidth(Batch& batch, uint32 paramOffset);
 
     typedef void (GLBackend::*CommandCall)(Batch&, uint32);
     static CommandCall _commandCalls[Batch::NUM_COMMANDS];

libraries/gpu/src/gpu/GLBackendInput.cpp

@@ -81,7 +81,7 @@ void GLBackend::killInput() {
 }
 
 void GLBackend::syncInputStateCache() {
-    for (int i = 0; i < _input._attributeActivation.size(); i++) {
+    for (uint32_t i = 0; i < _input._attributeActivation.size(); i++) {
         GLint active = 0;
         glGetVertexAttribiv(i, GL_VERTEX_ATTRIB_ARRAY_ENABLED, &active);
         _input._attributeActivation[i] = active;
@@ -244,7 +244,7 @@ void GLBackend::resetInputStage() {
     glBindBuffer(GL_ARRAY_BUFFER, 0);
 
 
-    for (int i = 0; i < _input._attributeActivation.size(); i++) {
+    for (uint32_t i = 0; i < _input._attributeActivation.size(); i++) {
         glDisableVertexAttribArray(i);
         glVertexAttribPointer(i, 4, GL_FLOAT, GL_FALSE, 0, 0);
     }
@@ -254,7 +254,7 @@ void GLBackend::resetInputStage() {
     _input._invalidFormat = false;
     _input._attributeActivation.reset();
 
-    for (int i = 0; i < _input._buffers.size(); i++) {
+    for (uint32_t i = 0; i < _input._buffers.size(); i++) {
         _input._buffers[i].reset();
         _input._bufferOffsets[i] = 0;
         _input._bufferStrides[i] = 0;

libraries/gpu/src/gpu/GLBackendPipeline.cpp

@@ -147,7 +147,7 @@ void GLBackend::resetPipelineStage() {
 }
 
 
-void GLBackend::releaseUniformBuffer(int slot) {
+void GLBackend::releaseUniformBuffer(uint32_t slot) {
 #if (GPU_FEATURE_PROFILE == GPU_CORE)
     auto& buf = _uniform._buffers[slot];
     if (buf) {
@@ -164,7 +164,7 @@ void GLBackend::releaseUniformBuffer(int slot) {
 }
 
 void GLBackend::resetUniformStage() {
-    for (int i = 0; i < _uniform._buffers.size(); i++) {
+    for (uint32_t i = 0; i < _uniform._buffers.size(); i++) {
         releaseUniformBuffer(i);
     }
 }
@@ -217,7 +217,7 @@ void GLBackend::do_setUniformBuffer(Batch& batch, uint32 paramOffset) {
 #endif
 }
 
-void GLBackend::releaseResourceTexture(int slot) {
+void GLBackend::releaseResourceTexture(uint32_t slot) {
     auto& tex = _resource._textures[slot];
     if (tex) {
         auto* object = Backend::getGPUObject<GLBackend::GLTexture>(*tex);
@@ -234,7 +234,7 @@ void GLBackend::releaseResourceTexture(int slot) {
 }
 
 void GLBackend::resetResourceStage() {
-    for (int i = 0; i < _resource._textures.size(); i++) {
+    for (uint32_t i = 0; i < _resource._textures.size(); i++) {
         releaseResourceTexture(i);
     }
 }

libraries/gpu/src/gpu/GLBackendShader.cpp

@@ -147,8 +147,8 @@ GLBackend::GLShader* compileShader(const Shader& shader) {
         char* temp = new char[infoLength] ;
         glGetShaderInfoLog(glshader, infoLength, NULL, temp);
 
-        qWarning() << "GLShader::compileShader - failed to compile the gl shader object:";
+        qCWarning(gpulogging) << "GLShader::compileShader - failed to compile the gl shader object:";
-        qWarning() << temp;
+        qCWarning(gpulogging) << temp;
 
         /*
         filestream.open("debugshader.glsl.info.txt");

libraries/gpu/src/gpu/GLBackendState.cpp

@@ -489,6 +489,9 @@ void GLBackend::syncPipelineStateCache() {
     glEnable(GL_PROGRAM_POINT_SIZE_EXT);
     glEnable(GL_VERTEX_PROGRAM_POINT_SIZE);
 
+    // Default line width accross the board
+    glLineWidth(1.0f);
+
     getCurrentGLState(state);
     State::Signature signature = State::evalSignature(state);
 
@@ -583,12 +586,9 @@ void GLBackend::do_setStateMultisampleEnable(bool enable) {
 
 void GLBackend::do_setStateAntialiasedLineEnable(bool enable) {
     if (_pipeline._stateCache.antialisedLineEnable != enable) {
-        // FIXME CORE
         if (enable) {
-        //    glEnable(GL_POINT_SMOOTH);
             glEnable(GL_LINE_SMOOTH);
         } else {
-        //    glDisable(GL_POINT_SMOOTH);
             glDisable(GL_LINE_SMOOTH);
         }
         (void) CHECK_GL_ERROR();

libraries/gpu/src/gpu/GPUConfig.h

@@ -19,14 +19,14 @@
 
 #if defined(__APPLE__)
 
-#include "../GL/glew.h"
+#include <GL/glew.h>
 
 #define GPU_FEATURE_PROFILE GPU_CORE
 #define GPU_INPUT_PROFILE GPU_CORE_41
 
 #elif defined(WIN32)
-#include "../GL/glew.h"
+#include <GL/glew.h>
-#include "../GL/wglew.h"
+#include <GL/wglew.h>
 
 #define GPU_FEATURE_PROFILE GPU_CORE
 #define GPU_INPUT_PROFILE GPU_CORE_41
@@ -35,7 +35,7 @@
 
 #else
 
-#include "../GL/glew.h"
+#include <GL/glew.h>
 
 #define GPU_FEATURE_PROFILE GPU_CORE
 #define GPU_INPUT_PROFILE GPU_CORE_41

libraries/gpu/src/gpu/Resource.cpp

@@ -14,7 +14,7 @@
 
 using namespace gpu;
 
-const Element Element::COLOR_RGBA_32 = Element(VEC4, UINT8, RGBA);
+const Element Element::COLOR_RGBA_32 = Element(VEC4, NUINT8, RGBA);
 const Element Element::VEC3F_XYZ = Element(VEC3, FLOAT, XYZ);
 const Element Element::INDEX_UINT16 = Element(SCALAR, UINT16, INDEX);
 const Element Element::PART_DRAWCALL = Element(VEC4, UINT32, PART);

libraries/gpu/src/gpu/State.h

@@ -260,7 +260,7 @@ public:
             depthClampEnable(false),
             scissorEnable(false),
             multisampleEnable(false),
-            antialisedLineEnable(false),
+            antialisedLineEnable(true),
             alphaToCoverageEnable(false)
         {}
     };

libraries/render-utils/src/DeferredLightingEffect.cpp

@@ -406,9 +406,7 @@ void DeferredLightingEffect::render(RenderArgs* args) {
     Transform viewMat;
     args->_viewFrustum->evalProjectionMatrix(projMat);
     args->_viewFrustum->evalViewTransform(viewMat);
-    if (args->_renderMode == RenderArgs::MIRROR_RENDER_MODE) {
+
-        viewMat.postScale(glm::vec3(-1.0f, 1.0f, 1.0f));
-    }
     batch.setProjectionTransform(projMat);
     batch.setViewTransform(viewMat);
 

libraries/render-utils/src/GeometryCache.cpp

@@ -277,7 +277,7 @@ void GeometryCache::renderSphere(gpu::Batch& batch, float radius, int slices, in
         streamFormat = std::make_shared<gpu::Stream::Format>(); // 1 for everyone
         streamFormat->setAttribute(gpu::Stream::POSITION, VERTICES_SLOT, gpu::Element(gpu::VEC3, gpu::FLOAT, gpu::XYZ), 0);
         streamFormat->setAttribute(gpu::Stream::NORMAL, NORMALS_SLOT, gpu::Element(gpu::VEC3, gpu::FLOAT, gpu::XYZ));
-        streamFormat->setAttribute(gpu::Stream::COLOR, COLOR_SLOT, gpu::Element(gpu::VEC4, gpu::UINT8, gpu::RGBA));
+        streamFormat->setAttribute(gpu::Stream::COLOR, COLOR_SLOT, gpu::Element(gpu::VEC4, gpu::NUINT8, gpu::RGBA));
         positionElement = streamFormat->getAttributes().at(gpu::Stream::POSITION)._element;
         normalElement = streamFormat->getAttributes().at(gpu::Stream::NORMAL)._element;
         colorElement = streamFormat->getAttributes().at(gpu::Stream::COLOR)._element;
@@ -363,7 +363,7 @@ void GeometryCache::renderGrid(gpu::Batch& batch, int xDivisions, int yDivisions
     auto streamFormat = std::make_shared<gpu::Stream::Format>(); // 1 for everyone
     
     streamFormat->setAttribute(gpu::Stream::POSITION, VERTICES_SLOT, gpu::Element(gpu::VEC2, gpu::FLOAT, gpu::XYZ), 0);
-    streamFormat->setAttribute(gpu::Stream::COLOR, COLOR_SLOT, gpu::Element(gpu::VEC4, gpu::UINT8, gpu::RGBA));
+    streamFormat->setAttribute(gpu::Stream::COLOR, COLOR_SLOT, gpu::Element(gpu::VEC4, gpu::NUINT8, gpu::RGBA));
 
     gpu::BufferView verticesView(verticesBuffer, 0, verticesBuffer->getSize(), streamFormat->getAttributes().at(gpu::Stream::POSITION)._element);
     gpu::BufferView colorView(colorBuffer, streamFormat->getAttributes().at(gpu::Stream::COLOR)._element);
@@ -470,7 +470,7 @@ void GeometryCache::renderGrid(gpu::Batch& batch, int x, int y, int width, int h
     auto streamFormat = std::make_shared<gpu::Stream::Format>(); // 1 for everyone
     
     streamFormat->setAttribute(gpu::Stream::POSITION, VERTICES_SLOT, gpu::Element(gpu::VEC2, gpu::FLOAT, gpu::XYZ), 0);
-    streamFormat->setAttribute(gpu::Stream::COLOR, COLOR_SLOT, gpu::Element(gpu::VEC4, gpu::UINT8, gpu::RGBA));
+    streamFormat->setAttribute(gpu::Stream::COLOR, COLOR_SLOT, gpu::Element(gpu::VEC4, gpu::NUINT8, gpu::RGBA));
 
     gpu::BufferView verticesView(verticesBuffer, 0, verticesBuffer->getSize(), streamFormat->getAttributes().at(gpu::Stream::POSITION)._element);
     gpu::BufferView colorView(colorBuffer, streamFormat->getAttributes().at(gpu::Stream::COLOR)._element);
@@ -507,7 +507,7 @@ void GeometryCache::updateVertices(int id, const QVector<glm::vec2>& points, con
     details.stream = stream;
 
     details.streamFormat->setAttribute(gpu::Stream::POSITION, 0, gpu::Element(gpu::VEC2, gpu::FLOAT, gpu::XYZ), 0);
-    details.streamFormat->setAttribute(gpu::Stream::COLOR, 1, gpu::Element(gpu::VEC4, gpu::UINT8, gpu::RGBA));
+    details.streamFormat->setAttribute(gpu::Stream::COLOR, 1, gpu::Element(gpu::VEC4, gpu::NUINT8, gpu::RGBA));
 
     details.stream->addBuffer(details.verticesBuffer, 0, details.streamFormat->getChannels().at(0)._stride);
     details.stream->addBuffer(details.colorBuffer, 0, details.streamFormat->getChannels().at(1)._stride);
@@ -568,7 +568,7 @@ void GeometryCache::updateVertices(int id, const QVector<glm::vec3>& points, con
     details.stream = stream;
 
     details.streamFormat->setAttribute(gpu::Stream::POSITION, 0, gpu::Element(gpu::VEC3, gpu::FLOAT, gpu::XYZ), 0);
-    details.streamFormat->setAttribute(gpu::Stream::COLOR, 1, gpu::Element(gpu::VEC4, gpu::UINT8, gpu::RGBA));
+    details.streamFormat->setAttribute(gpu::Stream::COLOR, 1, gpu::Element(gpu::VEC4, gpu::NUINT8, gpu::RGBA));
 
     details.stream->addBuffer(details.verticesBuffer, 0, details.streamFormat->getChannels().at(0)._stride);
     details.stream->addBuffer(details.colorBuffer, 0, details.streamFormat->getChannels().at(1)._stride);
@@ -632,7 +632,7 @@ void GeometryCache::updateVertices(int id, const QVector<glm::vec3>& points, con
 
     details.streamFormat->setAttribute(gpu::Stream::POSITION, 0, gpu::Element(gpu::VEC3, gpu::FLOAT, gpu::XYZ), 0);
     details.streamFormat->setAttribute(gpu::Stream::TEXCOORD, 0, gpu::Element(gpu::VEC2, gpu::FLOAT, gpu::UV), 3 * sizeof(float));
-    details.streamFormat->setAttribute(gpu::Stream::COLOR, 1, gpu::Element(gpu::VEC4, gpu::UINT8, gpu::RGBA));
+    details.streamFormat->setAttribute(gpu::Stream::COLOR, 1, gpu::Element(gpu::VEC4, gpu::NUINT8, gpu::RGBA));
 
     details.stream->addBuffer(details.verticesBuffer, 0, details.streamFormat->getChannels().at(0)._stride);
     details.stream->addBuffer(details.colorBuffer, 0, details.streamFormat->getChannels().at(1)._stride);
@@ -786,7 +786,7 @@ void GeometryCache::renderSolidCube(gpu::Batch& batch, float size, const glm::ve
         streamFormat = std::make_shared<gpu::Stream::Format>(); // 1 for everyone
         streamFormat->setAttribute(gpu::Stream::POSITION, VERTICES_SLOT, gpu::Element(gpu::VEC3, gpu::FLOAT, gpu::XYZ), 0);
         streamFormat->setAttribute(gpu::Stream::NORMAL, NORMALS_SLOT, gpu::Element(gpu::VEC3, gpu::FLOAT, gpu::XYZ));
-        streamFormat->setAttribute(gpu::Stream::COLOR, COLOR_SLOT, gpu::Element(gpu::VEC4, gpu::UINT8, gpu::RGBA));
+        streamFormat->setAttribute(gpu::Stream::COLOR, COLOR_SLOT, gpu::Element(gpu::VEC4, gpu::NUINT8, gpu::RGBA));
         positionElement = streamFormat->getAttributes().at(gpu::Stream::POSITION)._element;
         normalElement = streamFormat->getAttributes().at(gpu::Stream::NORMAL)._element;
         colorElement = streamFormat->getAttributes().at(gpu::Stream::COLOR)._element;
@@ -873,7 +873,7 @@ void GeometryCache::renderWireCube(gpu::Batch& batch, float size, const glm::vec
     if (!streamFormat) {
         streamFormat = std::make_shared<gpu::Stream::Format>(); // 1 for everyone
         streamFormat->setAttribute(gpu::Stream::POSITION, VERTICES_SLOT, gpu::Element(gpu::VEC3, gpu::FLOAT, gpu::XYZ), 0);
-        streamFormat->setAttribute(gpu::Stream::COLOR, COLOR_SLOT, gpu::Element(gpu::VEC4, gpu::UINT8, gpu::RGBA));
+        streamFormat->setAttribute(gpu::Stream::COLOR, COLOR_SLOT, gpu::Element(gpu::VEC4, gpu::NUINT8, gpu::RGBA));
         positionElement = streamFormat->getAttributes().at(gpu::Stream::POSITION)._element;
         colorElement = streamFormat->getAttributes().at(gpu::Stream::COLOR)._element;
     }
@@ -929,7 +929,7 @@ void GeometryCache::renderBevelCornersRect(gpu::Batch& batch, int x, int y, int
         details.stream = stream;
     
         details.streamFormat->setAttribute(gpu::Stream::POSITION, 0, gpu::Element(gpu::VEC2, gpu::FLOAT, gpu::XYZ));
-        details.streamFormat->setAttribute(gpu::Stream::COLOR, 1, gpu::Element(gpu::VEC4, gpu::UINT8, gpu::RGBA));
+        details.streamFormat->setAttribute(gpu::Stream::COLOR, 1, gpu::Element(gpu::VEC4, gpu::NUINT8, gpu::RGBA));
 
         details.stream->addBuffer(details.verticesBuffer, 0, details.streamFormat->getChannels().at(0)._stride);
         details.stream->addBuffer(details.colorBuffer, 0, details.streamFormat->getChannels().at(1)._stride);
@@ -1031,7 +1031,7 @@ void GeometryCache::renderQuad(gpu::Batch& batch, const glm::vec2& minCorner, co
         details.stream = stream;
     
         details.streamFormat->setAttribute(gpu::Stream::POSITION, 0, gpu::Element(gpu::VEC2, gpu::FLOAT, gpu::XYZ), 0);
-        details.streamFormat->setAttribute(gpu::Stream::COLOR, 1, gpu::Element(gpu::VEC4, gpu::UINT8, gpu::RGBA));
+        details.streamFormat->setAttribute(gpu::Stream::COLOR, 1, gpu::Element(gpu::VEC4, gpu::NUINT8, gpu::RGBA));
 
         details.stream->addBuffer(details.verticesBuffer, 0, details.streamFormat->getChannels().at(0)._stride);
         details.stream->addBuffer(details.colorBuffer, 0, details.streamFormat->getChannels().at(1)._stride);
@@ -1126,7 +1126,7 @@ void GeometryCache::renderQuad(gpu::Batch& batch, const glm::vec2& minCorner, co
     
         details.streamFormat->setAttribute(gpu::Stream::POSITION, 0, gpu::Element(gpu::VEC2, gpu::FLOAT, gpu::XYZ), 0);
         details.streamFormat->setAttribute(gpu::Stream::TEXCOORD, 0, gpu::Element(gpu::VEC2, gpu::FLOAT, gpu::UV), VERTEX_TEXCOORD_OFFSET);
-        details.streamFormat->setAttribute(gpu::Stream::COLOR, 1, gpu::Element(gpu::VEC4, gpu::UINT8, gpu::RGBA));
+        details.streamFormat->setAttribute(gpu::Stream::COLOR, 1, gpu::Element(gpu::VEC4, gpu::NUINT8, gpu::RGBA));
 
         details.stream->addBuffer(details.verticesBuffer, 0, details.streamFormat->getChannels().at(0)._stride);
         details.stream->addBuffer(details.colorBuffer, 0, details.streamFormat->getChannels().at(1)._stride);
@@ -1200,7 +1200,7 @@ void GeometryCache::renderQuad(gpu::Batch& batch, const glm::vec3& minCorner, co
         details.stream = stream;
     
         details.streamFormat->setAttribute(gpu::Stream::POSITION, 0, gpu::Element(gpu::VEC3, gpu::FLOAT, gpu::XYZ), 0);
-        details.streamFormat->setAttribute(gpu::Stream::COLOR, 1, gpu::Element(gpu::VEC4, gpu::UINT8, gpu::RGBA));
+        details.streamFormat->setAttribute(gpu::Stream::COLOR, 1, gpu::Element(gpu::VEC4, gpu::NUINT8, gpu::RGBA));
 
         details.stream->addBuffer(details.verticesBuffer, 0, details.streamFormat->getChannels().at(0)._stride);
         details.stream->addBuffer(details.colorBuffer, 0, details.streamFormat->getChannels().at(1)._stride);
@@ -1293,7 +1293,7 @@ void GeometryCache::renderQuad(gpu::Batch& batch, const glm::vec3& topLeft, cons
     
         details.streamFormat->setAttribute(gpu::Stream::POSITION, 0, gpu::Element(gpu::VEC3, gpu::FLOAT, gpu::XYZ), 0);
         details.streamFormat->setAttribute(gpu::Stream::TEXCOORD, 0, gpu::Element(gpu::VEC2, gpu::FLOAT, gpu::UV), VERTEX_TEXCOORD_OFFSET);
-        details.streamFormat->setAttribute(gpu::Stream::COLOR, 1, gpu::Element(gpu::VEC4, gpu::UINT8, gpu::RGBA));
+        details.streamFormat->setAttribute(gpu::Stream::COLOR, 1, gpu::Element(gpu::VEC4, gpu::NUINT8, gpu::RGBA));
 
         details.stream->addBuffer(details.verticesBuffer, 0, details.streamFormat->getChannels().at(0)._stride);
         details.stream->addBuffer(details.colorBuffer, 0, details.streamFormat->getChannels().at(1)._stride);
@@ -1373,7 +1373,7 @@ void GeometryCache::renderDashedLine(gpu::Batch& batch, const glm::vec3& start,
         details.stream = stream;
 
         details.streamFormat->setAttribute(gpu::Stream::POSITION, 0, gpu::Element(gpu::VEC3, gpu::FLOAT, gpu::XYZ), 0);
-        details.streamFormat->setAttribute(gpu::Stream::COLOR, 1, gpu::Element(gpu::VEC4, gpu::UINT8, gpu::RGBA));
+        details.streamFormat->setAttribute(gpu::Stream::COLOR, 1, gpu::Element(gpu::VEC4, gpu::NUINT8, gpu::RGBA));
 
         details.stream->addBuffer(details.verticesBuffer, 0, details.streamFormat->getChannels().at(0)._stride);
         details.stream->addBuffer(details.colorBuffer, 0, details.streamFormat->getChannels().at(1)._stride);
@@ -1531,7 +1531,7 @@ void GeometryCache::renderLine(gpu::Batch& batch, const glm::vec3& p1, const glm
         details.stream = stream;
     
         details.streamFormat->setAttribute(gpu::Stream::POSITION, 0, gpu::Element(gpu::VEC3, gpu::FLOAT, gpu::XYZ), 0);
-        details.streamFormat->setAttribute(gpu::Stream::COLOR, 1, gpu::Element(gpu::VEC4, gpu::UINT8, gpu::RGBA));
+        details.streamFormat->setAttribute(gpu::Stream::COLOR, 1, gpu::Element(gpu::VEC4, gpu::NUINT8, gpu::RGBA));
 
         details.stream->addBuffer(details.verticesBuffer, 0, details.streamFormat->getChannels().at(0)._stride);
         details.stream->addBuffer(details.colorBuffer, 0, details.streamFormat->getChannels().at(1)._stride);
@@ -1615,7 +1615,7 @@ void GeometryCache::renderLine(gpu::Batch& batch, const glm::vec2& p1, const glm
         details.stream = stream;
     
         details.streamFormat->setAttribute(gpu::Stream::POSITION, 0, gpu::Element(gpu::VEC3, gpu::FLOAT, gpu::XYZ), 0);
-        details.streamFormat->setAttribute(gpu::Stream::COLOR, 1, gpu::Element(gpu::VEC4, gpu::UINT8, gpu::RGBA));
+        details.streamFormat->setAttribute(gpu::Stream::COLOR, 1, gpu::Element(gpu::VEC4, gpu::NUINT8, gpu::RGBA));
 
         details.stream->addBuffer(details.verticesBuffer, 0, details.streamFormat->getChannels().at(0)._stride);
         details.stream->addBuffer(details.colorBuffer, 0, details.streamFormat->getChannels().at(1)._stride);

libraries/render-utils/src/Model.cpp

@@ -156,8 +156,6 @@ void Model::RenderPipelineLib::addRenderPipeline(Model::RenderKey key,
         RenderKey mirrorKey(key.getRaw() | RenderKey::IS_MIRROR);
         auto mirrorState = std::make_shared<gpu::State>(state->getValues());
 
-        mirrorState->setFrontFaceClockwise(true);
-
         // create a new RenderPipeline with the same shader side and the mirrorState
         auto mirrorPipeline = gpu::PipelinePointer(gpu::Pipeline::create(program, mirrorState));
         insert(value_type(mirrorKey.getRaw(), RenderPipeline(mirrorPipeline, locations)));

libraries/render-utils/src/RenderDeferredTask.cpp

@@ -166,9 +166,7 @@ void DrawOpaqueDeferred::run(const SceneContextPointer& sceneContext, const Rend
     Transform viewMat;
     args->_viewFrustum->evalProjectionMatrix(projMat);
     args->_viewFrustum->evalViewTransform(viewMat);
-    if (args->_renderMode == RenderArgs::MIRROR_RENDER_MODE) {
+
-        viewMat.preScale(glm::vec3(-1.0f, 1.0f, 1.0f));
-    }
     batch.setProjectionTransform(projMat);
     batch.setViewTransform(viewMat);
 
@@ -197,9 +195,7 @@ void DrawTransparentDeferred::run(const SceneContextPointer& sceneContext, const
     Transform viewMat;
     args->_viewFrustum->evalProjectionMatrix(projMat);
     args->_viewFrustum->evalViewTransform(viewMat);
-    if (args->_renderMode == RenderArgs::MIRROR_RENDER_MODE) {
+
-        viewMat.postScale(glm::vec3(-1.0f, 1.0f, 1.0f));
-    }
     batch.setProjectionTransform(projMat);
     batch.setViewTransform(viewMat);
     
@@ -259,9 +255,7 @@ void DrawOverlay3D::run(const SceneContextPointer& sceneContext, const RenderCon
     Transform viewMat;
     args->_viewFrustum->evalProjectionMatrix(projMat);
     args->_viewFrustum->evalViewTransform(viewMat);
-    if (args->_renderMode == RenderArgs::MIRROR_RENDER_MODE) {
+
-        viewMat.postScale(glm::vec3(-1.0f, 1.0f, 1.0f));
-    }
     batch.setProjectionTransform(projMat);
     batch.setViewTransform(viewMat);
     batch.setViewportTransform(args->_viewport);

libraries/render-utils/src/model_lightmap.slf

@@ -23,11 +23,11 @@ uniform sampler2D diffuseMap;
 uniform sampler2D emissiveMap;
 uniform vec2 emissiveParams;
 
-out vec4 _position;
+in vec4 _position;
-out vec2 _texCoord0;
+in vec2 _texCoord0;
-out vec2 _texCoord1;
+in vec2 _texCoord1;
-out vec3 _normal;
+in vec3 _normal;
-out vec3 _color;
+in vec3 _color;
 
 void main(void) {
     vec4 diffuse = texture(diffuseMap, _texCoord0);

libraries/render-utils/src/model_specular_map.slf

@@ -22,10 +22,10 @@ uniform sampler2D diffuseMap;
 // the specular texture
 uniform sampler2D specularMap;
 
-out vec4 _position;
+in vec4 _position;
-out vec2 _texCoord0;
+in vec2 _texCoord0;
-out vec3 _normal;
+in vec3 _normal;
-out vec3 _color;
+in vec3 _color;
 
 
 void main(void) {

libraries/render-utils/src/standardDrawTexture.slf

@@ -23,9 +23,5 @@ out vec4 outFragColor;
 
 void main(void) {
     vec4 color = texture(colorMap, varTexCoord0);
-    // FIXME CORE this isn't working
+    outFragColor = color * varColor;
-    //_fragColor = color * _color;
-    //_fragColor = vec4(color.rgb, color.a * _color.a);
-    //_fragColor = vec4(color.rgb * _color.rgb, color.a);
-    outFragColor = color;
 }

libraries/render-utils/src/stars.slf

@@ -11,8 +11,24 @@
 //
 
 in vec4 varColor;
+in float varSize;
+
 out vec4 outFragColor;
 
+const float EDGE_SIZE = 0.25;
+const float ALPHA_BOUNDARY = 1.0 - EDGE_SIZE;
+
 void main(void) {
-    outFragColor = varColor; //vec4(varColor, 1.0);
+    vec2 coord = gl_PointCoord * vec2(2.0) - vec2(1.0);
+    coord = coord * coord;
+
+    float l = coord.x + coord.y;
+    if (l > 1.0) {
+        discard;
+    }
+    
+    outFragColor = varColor; 
+    if (l >= ALPHA_BOUNDARY) {
+        outFragColor.a = smoothstep(1.0, ALPHA_BOUNDARY, l);
+    }
 }

libraries/render-utils/src/stars.slv

@@ -18,9 +18,12 @@
 
 <$declareStandardTransform()$>
 
-out vec3 varPosition;
+// TODO we need to get the viewport resolution and FOV passed to us so we can modify the point size
-out vec4 varColor;
+// and effectively producing a points that take up a constant angular size regardless of the display resolution 
+// or projection matrix
 
+out vec4 varColor;
+out float varSize;
 
 void main(void) {
     varColor = inColor.rgba;
@@ -29,6 +32,6 @@ void main(void) {
     TransformCamera cam = getTransformCamera();
     TransformObject obj = getTransformObject();
     <$transformModelToClipPos(cam, obj, inPosition, gl_Position)$>
-    varPosition = inPosition.xyz;
+    varSize = inColor.a;
-    gl_PointSize = inColor.a;
+    gl_PointSize = varSize; 
 }

libraries/render-utils/src/text/Font.cpp

@@ -303,12 +303,23 @@ void Font::rebuildVertices(float x, float y, const QString& str, const glm::vec2
                 // NOTE: Random guy on the internet's recommended triangle slices
                 // Triangle tri1 = { v0, v1, v2 };
                 // Triangle tri2 = { v2, v3, v0 };
+
+                // The problem here being that the 4 vertices are { ll, lr, ul, ur }, a Z pattern
+                // Additionally, you want to ensure that the shared side vertices are used sequentially
+                // to improve cache locality
+                //
+                //  2 -- 3
+                //  |    |
+                //  |    |
+                //  0 -- 1
+                //
+                //  { 0, 1, 2 } -> { 2, 1, 3 }
                 quint16 indices[NUMBER_OF_INDICES_PER_QUAD];
                 indices[0] = verticesOffset + 0;
                 indices[1] = verticesOffset + 1;
-                indices[2] = verticesOffset + 3;
+                indices[2] = verticesOffset + 2;
-                indices[3] = verticesOffset + 1;
+                indices[3] = verticesOffset + 2;
-                indices[4] = verticesOffset + 2;
+                indices[4] = verticesOffset + 1;
                 indices[5] = verticesOffset + 3;
                 _indicesBuffer->append(sizeof(indices), (const gpu::Byte*)indices);
                 _numIndices += NUMBER_OF_INDICES_PER_QUAD;

libraries/render/src/render/DrawStatus.cpp

@@ -132,9 +132,7 @@ void DrawStatus::run(const SceneContextPointer& sceneContext, const RenderContex
     Transform viewMat;
     args->_viewFrustum->evalProjectionMatrix(projMat);
     args->_viewFrustum->evalViewTransform(viewMat);
-    if (args->_renderMode == RenderArgs::MIRROR_RENDER_MODE) {
+
-        viewMat.postScale(glm::vec3(-1.0f, 1.0f, 1.0f));
-    }
     batch.setProjectionTransform(projMat);
     batch.setViewTransform(viewMat);
     batch.setModelTransform(Transform());

libraries/render/src/render/DrawTask.cpp

@@ -264,9 +264,7 @@ void DrawBackground::run(const SceneContextPointer& sceneContext, const RenderCo
     Transform viewMat;
     args->_viewFrustum->evalProjectionMatrix(projMat);
     args->_viewFrustum->evalViewTransform(viewMat);
-    if (args->_renderMode == RenderArgs::MIRROR_RENDER_MODE) {
+
-        viewMat.postScale(glm::vec3(-1.0f, 1.0f, 1.0f));
-    }
     batch.setProjectionTransform(projMat);
     batch.setViewTransform(viewMat);
 

libraries/shared/src/GLHelpers.cpp

@@ -10,7 +10,6 @@ QSurfaceFormat getDefaultOpenGlSurfaceFormat() {
 #ifdef DEBUG
    format.setOption(QSurfaceFormat::DebugContext);
 #endif
-   // FIXME move to core as soon as possible
+   format.setProfile(QSurfaceFormat::OpenGLContextProfile::CoreProfile);
-   format.setProfile(QSurfaceFormat::OpenGLContextProfile::CompatibilityProfile);
    return format;
 }

tests/render-utils/src/main.cpp

@@ -155,7 +155,6 @@ public:
 
         makeCurrent();
 
-//        setFramePosition(QPoint(-1000, 0));
         resize(QSize(800, 600));
     }