diff options
| -rw-r--r-- | .github/workflows/build.yaml | 4 | ||||
| -rw-r--r-- | indra/llrender/llimagegl.cpp | 4 | ||||
| -rw-r--r-- | indra/newview/featuretable_mac.txt | 4 |
3 files changed, 8 insertions, 4 deletions
diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml index 57e86ad8f6..7d6bcd2bc4 100644 --- a/.github/workflows/build.yaml +++ b/.github/workflows/build.yaml @@ -42,7 +42,7 @@ jobs: needs: setup strategy: matrix: - runner: [windows-large, macos-13-xlarge] + runner: [windows-large, macos-12-large] configuration: ${{ fromJSON(needs.setup.outputs.configurations) }} runs-on: ${{ matrix.runner }} outputs: @@ -64,7 +64,7 @@ jobs: # autobuild-package.xml. AUTOBUILD_VCS_INFO: "true" AUTOBUILD_VSVER: "170" - DEVELOPER_DIR: "/Applications/Xcode_14.1.app/Contents/Developer" + DEVELOPER_DIR: "/Applications/Xcode_14.0.1.app/Contents/Developer" # Ensure that Linden viewer builds engage Bugsplat. BUGSPLAT_DB: ${{ needs.setup.outputs.bugsplat_db }} build_coverity: false diff --git a/indra/llrender/llimagegl.cpp b/indra/llrender/llimagegl.cpp index 18fafa201c..4e2658dcdc 100644 --- a/indra/llrender/llimagegl.cpp +++ b/indra/llrender/llimagegl.cpp @@ -2537,7 +2537,9 @@ bool LLImageGL::scaleDown(S32 desired_discard) { LL_PROFILE_ZONE_SCOPED_CATEGORY_TEXTURE; - if (mTarget != GL_TEXTURE_2D) + if (mTarget != GL_TEXTURE_2D + || mFormatInternal == -1 // not initialized + ) { return false; } diff --git a/indra/newview/featuretable_mac.txt b/indra/newview/featuretable_mac.txt index cfc1ea8f42..eedce61509 100644 --- a/indra/newview/featuretable_mac.txt +++ b/indra/newview/featuretable_mac.txt @@ -1,4 +1,4 @@ -version 71 +version 72 // The version number above should be incremented IF AND ONLY IF some // change has been made that is sufficiently important to justify // resetting the graphics preferences of all users to the recommended @@ -84,6 +84,7 @@ RenderExposure 1 1 RenderTonemapType 1 1 RenderTonemapMix 1 1 RenderDisableVintageMode 1 1 +RenderDownScaleMethod 1 0 // // Low Graphics Settings @@ -408,6 +409,7 @@ RenderTerrainPBRDetail 1 -1 list AMD UseOcclusion 1 0 RenderGLMultiThreadedTextures 1 0 +RenderGLMultiThreadedMedia 1 0 list NVIDIA RenderGLMultiThreadedTextures 1 0 |