render area affects viewport only (cocos#9502)

hobby10 · Oct 19, 2021 · bf3b561 · bf3b561
1 parent 271a4d8
commit bf3b561
Show file tree

Hide file tree

Showing 76 changed files with 119 additions and 100 deletions.
diff --git a/cocos/core/gfx/webgl/webgl-commands.ts b/cocos/core/gfx/webgl/webgl-commands.ts
@@ -1602,18 +1602,6 @@ export function WebGLCmdFuncBeginRenderPass (
             cache.viewport.height = renderArea.height;
         }
 
-        if (cache.scissorRect.x !== renderArea.x
-            || cache.scissorRect.y !== renderArea.y
-            || cache.scissorRect.width !== renderArea.width
-            || cache.scissorRect.height !== renderArea.height) {
-            gl.scissor(renderArea.x, renderArea.y, renderArea.width, renderArea.height);
-
-            cache.scissorRect.x = renderArea.x;
-            cache.scissorRect.y = renderArea.y;
-            cache.scissorRect.width = renderArea.width;
-            cache.scissorRect.height = renderArea.height;
-        }
-
         // const invalidateAttachments: GLenum[] = [];
         let clearCount = clearColors.length;
 

diff --git a/cocos/core/gfx/webgl2/webgl2-commands.ts b/cocos/core/gfx/webgl2/webgl2-commands.ts
@@ -1744,18 +1744,6 @@ export function WebGL2CmdFuncBeginRenderPass (
             cache.viewport.height = renderArea.height;
         }
 
-        if (cache.scissorRect.x !== renderArea.x
-            || cache.scissorRect.y !== renderArea.y
-            || cache.scissorRect.width !== renderArea.width
-            || cache.scissorRect.height !== renderArea.height) {
-            gl.scissor(renderArea.x, renderArea.y, renderArea.width, renderArea.height);
-
-            cache.scissorRect.x = renderArea.x;
-            cache.scissorRect.y = renderArea.y;
-            cache.scissorRect.width = renderArea.width;
-            cache.scissorRect.height = renderArea.height;
-        }
-
         gfxStateCache.invalidateAttachments.length = 0;
 
         for (let j = 0; j < clearColors.length; ++j) {

diff --git a/editor/assets/default_prefab/3d/Capsule.prefab.meta b/editor/assets/default_prefab/3d/Capsule.prefab.meta
@@ -1,5 +1,5 @@
 {
-  "ver": "1.1.34",
+  "ver": "1.1.35",
   "importer": "prefab",
   "imported": true,
   "uuid": "73ce1f7f-d1f4-4942-ad93-66ca3b3041ab",

diff --git a/editor/assets/default_prefab/3d/Cone.prefab.meta b/editor/assets/default_prefab/3d/Cone.prefab.meta
@@ -1,5 +1,5 @@
 {
-  "ver": "1.1.34",
+  "ver": "1.1.35",
   "importer": "prefab",
   "imported": true,
   "uuid": "6350d660-e888-4acf-a552-f3b719ae9110",

diff --git a/editor/assets/default_prefab/3d/Cube.prefab.meta b/editor/assets/default_prefab/3d/Cube.prefab.meta
@@ -1,5 +1,5 @@
 {
-  "ver": "1.1.34",
+  "ver": "1.1.35",
   "importer": "prefab",
   "imported": true,
   "uuid": "30da77a1-f02d-4ede-aa56-403452ee7fde",

diff --git a/editor/assets/default_prefab/3d/Cylinder.prefab.meta b/editor/assets/default_prefab/3d/Cylinder.prefab.meta
@@ -1,5 +1,5 @@
 {
-  "ver": "1.1.34",
+  "ver": "1.1.35",
   "importer": "prefab",
   "imported": true,
   "uuid": "ab3e16f9-671e-48a7-90b7-d0884d9cbb85",

diff --git a/editor/assets/default_prefab/3d/Plane.prefab.meta b/editor/assets/default_prefab/3d/Plane.prefab.meta
@@ -1,5 +1,5 @@
 {
-  "ver": "1.1.34",
+  "ver": "1.1.35",
   "importer": "prefab",
   "imported": true,
   "uuid": "40563723-f8fc-4216-99ea-a81636435c10",

diff --git a/editor/assets/default_prefab/3d/Quad.prefab.meta b/editor/assets/default_prefab/3d/Quad.prefab.meta
@@ -1,5 +1,5 @@
 {
-  "ver": "1.1.34",
+  "ver": "1.1.35",
   "importer": "prefab",
   "imported": true,
   "uuid": "34a07346-9f62-4a84-90ae-cb83f7a426c1",

diff --git a/editor/assets/default_prefab/3d/Sphere.prefab.meta b/editor/assets/default_prefab/3d/Sphere.prefab.meta
@@ -1,5 +1,5 @@
 {
-  "ver": "1.1.34",
+  "ver": "1.1.35",
   "importer": "prefab",
   "imported": true,
   "uuid": "655c9519-1a37-472b-bae6-29fefac0b550",

diff --git a/editor/assets/default_prefab/3d/Torus.prefab.meta b/editor/assets/default_prefab/3d/Torus.prefab.meta
@@ -1,5 +1,5 @@
 {
-  "ver": "1.1.34",
+  "ver": "1.1.35",
   "importer": "prefab",
   "imported": true,
   "uuid": "d47f5d5e-c931-4ff4-987b-cc818a728b82",

diff --git a/editor/assets/default_prefab/Camera.prefab.meta b/editor/assets/default_prefab/Camera.prefab.meta
@@ -1,5 +1,5 @@
 {
-  "ver": "1.1.34",
+  "ver": "1.1.35",
   "importer": "prefab",
   "imported": true,
   "uuid": "bb0a6472-cd67-4afb-a031-94fca8f4cc92",

diff --git a/editor/assets/default_prefab/Terrain.prefab.meta b/editor/assets/default_prefab/Terrain.prefab.meta
@@ -1,5 +1,5 @@
 {
-  "ver": "1.1.34",
+  "ver": "1.1.35",
   "importer": "prefab",
   "imported": true,
   "uuid": "90e8b0d4-12dc-412d-9156-ea1fdb18c15b",

diff --git a/editor/assets/default_prefab/effects/Particle System.prefab.meta b/editor/assets/default_prefab/effects/Particle System.prefab.meta
@@ -1,5 +1,5 @@
 {
-  "ver": "1.1.34",
+  "ver": "1.1.35",
   "importer": "prefab",
   "imported": true,
   "uuid": "f09a0597-10e6-49e5-8759-a148b5e85395",

diff --git a/editor/assets/default_prefab/light/Directional Light.prefab b/editor/assets/default_prefab/light/Directional Light.prefab
@@ -75,7 +75,8 @@
     "_id": "",
     "__prefab": {
       "__id__": 3
-    }
+    },
+    "_illuminanceLDR": null
   },
   {
     "__type__": "cc.CompPrefabInfo",

diff --git a/editor/assets/default_prefab/light/Directional Light.prefab.meta b/editor/assets/default_prefab/light/Directional Light.prefab.meta
@@ -1,5 +1,5 @@
 {
-  "ver": "1.1.34",
+  "ver": "1.1.35",
   "importer": "prefab",
   "imported": true,
   "uuid": "a0e9756d-9128-4f49-8097-e041c8b733b8",

diff --git a/editor/assets/default_prefab/light/Sphere Light.prefab b/editor/assets/default_prefab/light/Sphere Light.prefab
@@ -77,7 +77,8 @@
     "_id": "",
     "__prefab": {
       "__id__": 3
-    }
+    },
+    "_luminanceLDR": null
   },
   {
     "__type__": "cc.CompPrefabInfo",

diff --git a/editor/assets/default_prefab/light/Sphere Light.prefab.meta b/editor/assets/default_prefab/light/Sphere Light.prefab.meta
@@ -1,5 +1,5 @@
 {
-  "ver": "1.1.34",
+  "ver": "1.1.35",
   "importer": "prefab",
   "imported": true,
   "uuid": "4182ee46-ffa0-4de2-b66b-c93cc6c7e9b8",

diff --git a/editor/assets/default_prefab/light/Spot Light.prefab b/editor/assets/default_prefab/light/Spot Light.prefab
@@ -78,7 +78,8 @@
     "_id": "",
     "__prefab": {
       "__id__": 3
-    }
+    },
+    "_luminanceLDR": null
   },
   {
     "__type__": "cc.CompPrefabInfo",

diff --git a/editor/assets/default_prefab/light/Spot Light.prefab.meta b/editor/assets/default_prefab/light/Spot Light.prefab.meta
@@ -1,5 +1,5 @@
 {
-  "ver": "1.1.34",
+  "ver": "1.1.35",
   "importer": "prefab",
   "imported": true,
   "uuid": "7a49aa24-bd7a-40a8-b31a-b2a9da85abcd",

diff --git a/editor/assets/default_prefab/ui/Button.prefab.meta b/editor/assets/default_prefab/ui/Button.prefab.meta
@@ -1,5 +1,5 @@
 {
-  "ver": "1.1.34",
+  "ver": "1.1.35",
   "importer": "prefab",
   "imported": true,
   "uuid": "90bdd2a9-2838-4888-b66c-e94c8b7a5169",

diff --git a/editor/assets/default_prefab/ui/Canvas.prefab.meta b/editor/assets/default_prefab/ui/Canvas.prefab.meta
@@ -1,5 +1,5 @@
 {
-  "ver": "1.1.34",
+  "ver": "1.1.35",
   "importer": "prefab",
   "imported": true,
   "uuid": "f773db21-62b8-4540-956a-29bacf5ddbf5",

diff --git a/editor/assets/default_prefab/ui/EditBox.prefab.meta b/editor/assets/default_prefab/ui/EditBox.prefab.meta
@@ -1,5 +1,5 @@
 {
-  "ver": "1.1.34",
+  "ver": "1.1.35",
   "importer": "prefab",
   "imported": true,
   "uuid": "05e79121-8675-4551-9ad7-1b901a4025db",

diff --git a/editor/assets/default_prefab/ui/Graphics.prefab.meta b/editor/assets/default_prefab/ui/Graphics.prefab.meta
@@ -1,5 +1,5 @@
 {
-  "ver": "1.1.34",
+  "ver": "1.1.35",
   "importer": "prefab",
   "imported": true,
   "uuid": "c96e159e-43ea-4a16-8279-05bc39119d1a",

diff --git a/editor/assets/default_prefab/ui/Label.prefab.meta b/editor/assets/default_prefab/ui/Label.prefab.meta
@@ -1,5 +1,5 @@
 {
-  "ver": "1.1.34",
+  "ver": "1.1.35",
   "importer": "prefab",
   "imported": true,
   "uuid": "36008810-7ad3-47c0-8112-e30aee089e45",

diff --git a/editor/assets/default_prefab/ui/Layout.prefab.meta b/editor/assets/default_prefab/ui/Layout.prefab.meta
@@ -1,5 +1,5 @@
 {
-  "ver": "1.1.34",
+  "ver": "1.1.35",
   "importer": "prefab",
   "imported": true,
   "uuid": "a9ef7dfc-ea8b-4cf8-918e-36da948c4de0",

diff --git a/editor/assets/default_prefab/ui/Mask.prefab.meta b/editor/assets/default_prefab/ui/Mask.prefab.meta
@@ -1,5 +1,5 @@
 {
-  "ver": "1.1.34",
+  "ver": "1.1.35",
   "importer": "prefab",
   "imported": true,
   "uuid": "7fa63aed-f3e2-46a5-8a7c-c1a1adf6cea6",

diff --git a/editor/assets/default_prefab/ui/ParticleSystem2D.prefab.meta b/editor/assets/default_prefab/ui/ParticleSystem2D.prefab.meta
@@ -1,5 +1,5 @@
 {
-  "ver": "1.1.34",
+  "ver": "1.1.35",
   "importer": "prefab",
   "imported": true,
   "uuid": "f396261e-3e06-41ec-bdd6-9a8b6d99026f",

diff --git a/editor/assets/default_prefab/ui/ProgressBar.prefab.meta b/editor/assets/default_prefab/ui/ProgressBar.prefab.meta
@@ -1,5 +1,5 @@
 {
-  "ver": "1.1.34",
+  "ver": "1.1.35",
   "importer": "prefab",
   "imported": true,
   "uuid": "0d9353c4-6fb9-49bb-bc62-77f1750078c2",

diff --git a/editor/assets/default_prefab/ui/RichText.prefab.meta b/editor/assets/default_prefab/ui/RichText.prefab.meta
@@ -1,5 +1,5 @@
 {
-  "ver": "1.1.34",
+  "ver": "1.1.35",
   "importer": "prefab",
   "imported": true,
   "uuid": "fc6bfcfa-8086-4326-809b-0ba1226bac7d",

diff --git a/editor/assets/default_prefab/ui/ScrollView.prefab.meta b/editor/assets/default_prefab/ui/ScrollView.prefab.meta
@@ -1,5 +1,5 @@
 {
-  "ver": "1.1.34",
+  "ver": "1.1.35",
   "importer": "prefab",
   "imported": true,
   "uuid": "c1baa707-78d6-4b89-8d5d-0b7fdf0c39bc",

diff --git a/editor/assets/default_prefab/ui/Slider.prefab.meta b/editor/assets/default_prefab/ui/Slider.prefab.meta
@@ -1,5 +1,5 @@
 {
-  "ver": "1.1.34",
+  "ver": "1.1.35",
   "importer": "prefab",
   "imported": true,
   "uuid": "2bd7e5b6-cd8c-41a1-8136-ddb8efbf6326",

diff --git a/editor/assets/default_prefab/ui/Sprite.prefab.meta b/editor/assets/default_prefab/ui/Sprite.prefab.meta
@@ -1,5 +1,5 @@
 {
-  "ver": "1.1.34",
+  "ver": "1.1.35",
   "importer": "prefab",
   "imported": true,
   "uuid": "9db8cd0b-cbe4-42e7-96a9-a239620c0a9d",

diff --git a/editor/assets/default_prefab/ui/SpriteSplash.prefab.meta b/editor/assets/default_prefab/ui/SpriteSplash.prefab.meta
@@ -1,5 +1,5 @@
 {
-  "ver": "1.1.34",
+  "ver": "1.1.35",
   "importer": "prefab",
   "imported": true,
   "uuid": "e5f21aad-3a69-4011-ac62-b74352ac025e",

diff --git a/editor/assets/default_prefab/ui/TiledMap.prefab.meta b/editor/assets/default_prefab/ui/TiledMap.prefab.meta
@@ -1,5 +1,5 @@
 {
-  "ver": "1.1.34",
+  "ver": "1.1.35",
   "importer": "prefab",
   "imported": true,
   "uuid": "3139fa4f-8c42-4ce6-98be-15e848d9734c",

diff --git a/editor/assets/default_prefab/ui/Toggle.prefab.meta b/editor/assets/default_prefab/ui/Toggle.prefab.meta
@@ -1,5 +1,5 @@
 {
-  "ver": "1.1.34",
+  "ver": "1.1.35",
   "importer": "prefab",
   "imported": true,
   "uuid": "0e89afe7-56de-4f99-96a1-cba8a75bedd2",

diff --git a/editor/assets/default_prefab/ui/ToggleContainer.prefab.meta b/editor/assets/default_prefab/ui/ToggleContainer.prefab.meta
@@ -1,5 +1,5 @@
 {
-  "ver": "1.1.34",
+  "ver": "1.1.35",
   "importer": "prefab",
   "imported": true,
   "uuid": "2af73429-41d1-4346-9062-7798e42945dd",

diff --git a/editor/assets/default_prefab/ui/VideoPlayer.prefab.meta b/editor/assets/default_prefab/ui/VideoPlayer.prefab.meta
@@ -1,5 +1,5 @@
 {
-  "ver": "1.1.34",
+  "ver": "1.1.35",
   "importer": "prefab",
   "imported": true,
   "uuid": "7e089eaf-fa97-40d7-8a20-741a152585df",

diff --git a/editor/assets/default_prefab/ui/WebView.prefab.meta b/editor/assets/default_prefab/ui/WebView.prefab.meta
@@ -1,5 +1,5 @@
 {
-  "ver": "1.1.34",
+  "ver": "1.1.35",
   "importer": "prefab",
   "imported": true,
   "uuid": "9c541fa2-1dc8-4d8b-813a-aec89133f5b1",

diff --git a/editor/assets/default_prefab/ui/Widget.prefab.meta b/editor/assets/default_prefab/ui/Widget.prefab.meta
@@ -1,5 +1,5 @@
 {
-  "ver": "1.1.34",
+  "ver": "1.1.35",
   "importer": "prefab",
   "imported": true,
   "uuid": "36ed4422-3542-4cc4-bf02-dc4bfc590836",

diff --git a/editor/assets/default_prefab/ui/pageView.prefab.meta b/editor/assets/default_prefab/ui/pageView.prefab.meta
@@ -1,5 +1,5 @@
 {
-  "ver": "1.1.34",
+  "ver": "1.1.35",
   "importer": "prefab",
   "imported": true,
   "uuid": "20a5d8cb-ccad-4543-a937-fccd98c9f3de",

diff --git a/editor/assets/effects/builtin-billboard.effect.meta b/editor/assets/effects/builtin-billboard.effect.meta
@@ -1,5 +1,5 @@
 {
-  "ver": "1.4.8",
+  "ver": "1.4.7",
   "importer": "effect",
   "imported": true,
   "uuid": "711ebe11-f673-4cd9-9a83-63c60ba54c5b",

diff --git a/editor/assets/effects/builtin-clear-stencil.effect.meta b/editor/assets/effects/builtin-clear-stencil.effect.meta
@@ -1,5 +1,5 @@
 {
-  "ver": "1.4.8",
+  "ver": "1.4.7",
   "importer": "effect",
   "imported": true,
   "uuid": "810e96e4-e456-4468-9b59-f4e8f39732c0",

diff --git a/editor/assets/effects/builtin-graphics.effect.meta b/editor/assets/effects/builtin-graphics.effect.meta
@@ -1,5 +1,5 @@
 {
-  "ver": "1.4.8",
+  "ver": "1.4.7",
   "importer": "effect",
   "imported": true,
   "uuid": "1c02ae6f-4492-4915-b8f8-7492a3b1e4cd",

diff --git a/editor/assets/effects/builtin-occlusion-query.effect.meta b/editor/assets/effects/builtin-occlusion-query.effect.meta
@@ -1,5 +1,5 @@
 {
-  "ver": "1.4.8",
+  "ver": "1.4.7",
   "importer": "effect",
   "imported": true,
   "uuid": "d9937e59-61fe-4ec6-92ab-7ac5a19c89b0",

diff --git a/editor/assets/effects/builtin-particle-gpu.effect.meta b/editor/assets/effects/builtin-particle-gpu.effect.meta
@@ -1,5 +1,5 @@
 {
-  "ver": "1.4.8",
+  "ver": "1.4.7",
   "importer": "effect",
   "imported": true,
   "uuid": "971bdb23-3ff6-43eb-b422-1c30165a3663",

diff --git a/editor/assets/effects/builtin-particle-trail.effect.meta b/editor/assets/effects/builtin-particle-trail.effect.meta
@@ -1,5 +1,5 @@
 {
-  "ver": "1.4.8",
+  "ver": "1.4.7",
   "importer": "effect",
   "imported": true,
   "uuid": "17debcc3-0a6b-4b8a-b00b-dc58b885581e",

diff --git a/editor/assets/effects/builtin-particle.effect.meta b/editor/assets/effects/builtin-particle.effect.meta
@@ -1,5 +1,5 @@
 {
-  "ver": "1.4.8",
+  "ver": "1.4.7",
   "importer": "effect",
   "imported": true,
   "uuid": "d1346436-ac96-4271-b863-1f4fdead95b0",

diff --git a/editor/assets/effects/builtin-reflection-deferred.effect.meta b/editor/assets/effects/builtin-reflection-deferred.effect.meta
@@ -1,5 +1,5 @@
 {
-  "ver": "1.4.8",
+  "ver": "1.4.7",
   "importer": "effect",
   "imported": true,
   "uuid": "99498f84-efe6-43a6-a9a7-e6e93eb845c1",

diff --git a/editor/assets/effects/builtin-spine.effect.meta b/editor/assets/effects/builtin-spine.effect.meta
@@ -1,5 +1,5 @@
 {
-  "ver": "1.4.8",
+  "ver": "1.4.7",
   "importer": "effect",
   "imported": true,
   "uuid": "c27215d8-6835-4b68-bfbb-bdeac6100c04",

diff --git a/editor/assets/effects/builtin-sprite-gpu.effect.meta b/editor/assets/effects/builtin-sprite-gpu.effect.meta
@@ -1,5 +1,5 @@
 {
-  "ver": "1.4.8",
+  "ver": "1.4.7",
   "importer": "effect",
   "imported": true,
   "uuid": "ecf28c14-a31d-450b-8434-25636525fc28",

diff --git a/editor/assets/effects/builtin-sprite.effect.meta b/editor/assets/effects/builtin-sprite.effect.meta
@@ -1,5 +1,5 @@
 {
-  "ver": "1.4.8",
+  "ver": "1.4.7",
   "importer": "effect",
   "imported": true,
   "uuid": "60f7195c-ec2a-45eb-ba94-8955f60e81d0",

diff --git a/editor/assets/effects/builtin-standard.effect.meta b/editor/assets/effects/builtin-standard.effect.meta
@@ -1,5 +1,5 @@
 {
-  "ver": "1.4.8",
+  "ver": "1.4.7",
   "importer": "effect",
   "imported": true,
   "uuid": "1baf0fc9-befa-459c-8bdd-af1a450a0319",