目前貌似鸿蒙无法调用native so代码
This commit is contained in:
parent
a540f90d57
commit
de254a0140
1
.gitignore
vendored
1
.gitignore
vendored
@ -60,3 +60,4 @@ UserSettings/
|
||||
**/.DS_Store
|
||||
out/
|
||||
.vscode/
|
||||
Il2CppBackup/
|
||||
File diff suppressed because it is too large
Load Diff
@ -29,13 +29,14 @@ public class Test : MonoBehaviour
|
||||
private int dlssQuality;
|
||||
|
||||
private bool xessOn = false;
|
||||
private bool hwssr = false;
|
||||
|
||||
private void Start()
|
||||
{
|
||||
RenderingPlugin.InitSupportFeatures();
|
||||
}
|
||||
|
||||
public void OnClickVRS()
|
||||
public void OnClickVRS()
|
||||
{
|
||||
var asset = UniversalRenderPipeline.asset;
|
||||
if (asset != null)
|
||||
@ -85,7 +86,7 @@ public class Test : MonoBehaviour
|
||||
|
||||
SuperResolutionParamSets.Instance.Set<bool>("NeedJitter", false);
|
||||
SuperResolutionParamSets.Instance.Set<float>("MipmapBias", 0);
|
||||
asset.superResolution= ESuperResolution.None;
|
||||
asset.superResolution = ESuperResolution.None;
|
||||
dlss.SetActive(false);
|
||||
}
|
||||
}
|
||||
@ -103,7 +104,10 @@ public class Test : MonoBehaviour
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
#if !UNITY_ANDROID && !UNITY_IPHONE && !UNITY_IOS && !UNITY_EDITOR_OSX && !UNITY_OPENHARMONY
|
||||
dlss.quality = (UnityEngine.NVIDIA.DLSSQuality)dlssQuality;
|
||||
#endif
|
||||
}
|
||||
|
||||
if (Input.GetKey(KeyCode.LeftShift) && Input.GetKeyDown(KeyCode.X))
|
||||
@ -163,10 +167,50 @@ public class Test : MonoBehaviour
|
||||
// asset.superResolution = ESuperResolution.METAL_FX_SPATIAL_SR;
|
||||
// asset.UpdateSSSettings();
|
||||
//}
|
||||
#if !UNITY_ANDROID && !UNITY_IPHONE && !UNITY_IOS && !UNITY_EDITOR_OSX && !UNITY_OPENHARMONY
|
||||
|
||||
GUI.Label(new Rect(50, 100, 300, 100), $"ctrl + r resultion:{resultions[resultionIndex]}", font);
|
||||
GUI.Label(new Rect(50, 150, 300, 100), $"ctrl + e dlss:{(dlssOn ? "On" : "Off")}", font);
|
||||
GUI.Label(new Rect(50, 200, 300, 100), $"ctrl + q quality:{dlssQualitys[dlssQuality]}", font);
|
||||
#endif
|
||||
#if UNITY_EDITOR_WIN || UNITY_OPENHARMONY
|
||||
if (GUI.Button(new Rect(50, 100, 300, 50), $"resultion:{resultions[resultionIndex]}"))
|
||||
{
|
||||
resultionIndex++;
|
||||
resultionIndex = resultionIndex % resultions.Length;
|
||||
UniversalRenderPipeline.asset.renderScale = resultions[resultionIndex];
|
||||
}
|
||||
if (GUI.Button(new Rect(50, 150, 300, 50), $"HWSpatialUpScale:{(hwssr ? "On" : "Off")}"))
|
||||
{
|
||||
hwssr = !hwssr;
|
||||
var asset = UniversalRenderPipeline.asset;
|
||||
HuaweiSR hwsr = null;
|
||||
foreach (var item in asset.GetRenderer(0).rendererFeatures)
|
||||
{
|
||||
if (item is HuaweiSR sr)
|
||||
{
|
||||
hwsr = sr;
|
||||
break;
|
||||
}
|
||||
}
|
||||
if (hwssr)
|
||||
{
|
||||
asset.superResolution = ESuperResolution.HW_SPATIAL_SR;
|
||||
hwsr.SetSR(ESuperResolution.HW_SPATIAL_SR);
|
||||
}
|
||||
else
|
||||
{
|
||||
SuperResolutionParamSets.Instance.Set<bool>("NeedJitter", false);
|
||||
SuperResolutionParamSets.Instance.Set<float>("MipmapBias", 0);
|
||||
asset.superResolution = ESuperResolution.None;
|
||||
hwsr.SetSR(ESuperResolution.None);
|
||||
}
|
||||
|
||||
}
|
||||
#endif
|
||||
#if UNITY_EDITOR_WIN || UNITY_STANDALONE_WIN
|
||||
GUI.Label(new Rect(50, 250, 300, 100), $"shift + x xess:{(xessOn ? "On" : "Off")}", font);
|
||||
#endif
|
||||
}
|
||||
|
||||
public static void TestBatchMode()
|
||||
@ -174,3 +218,4 @@ public class Test : MonoBehaviour
|
||||
Debug.Log("TestBatchMode");
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@ -1,5 +1,5 @@
|
||||
%YAML 1.1
|
||||
%TAG !u! tag:unity3d.com,2011:
|
||||
%TAG !u! tag:yousandi.cn,2023:
|
||||
--- !u!114 &11400000
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
|
||||
@ -1,5 +1,5 @@
|
||||
%YAML 1.1
|
||||
%TAG !u! tag:unity3d.com,2011:
|
||||
%TAG !u! tag:yousandi.cn,2023:
|
||||
--- !u!114 &-8576419846133267094
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
@ -27,11 +27,6 @@ MonoBehaviour:
|
||||
m_Name: DLSS
|
||||
m_EditorClassIdentifier:
|
||||
m_Active: 0
|
||||
quality: 2
|
||||
useOptimalSetting: 0
|
||||
sharpness: 0
|
||||
preExposure: 0
|
||||
mipMapBias: 0
|
||||
--- !u!114 &-7390778553674367771
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
@ -56,6 +51,22 @@ MonoBehaviour:
|
||||
ComputeShader: {fileID: 7200000, guid: 7b9233ff11584414688b5f10a526ca15, type: 3}
|
||||
v3setting:
|
||||
ComputeShader: {fileID: 7200000, guid: b79f3a2fdeeac5745b545fc41148f6c3, type: 3}
|
||||
--- !u!114 &-4454652084718109581
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 0}
|
||||
m_Enabled: 1
|
||||
m_EditorHideFlags: 0
|
||||
m_Script: {fileID: 11500000, guid: a4cfce835b2919a4c954f788ca0d08b0, type: 3}
|
||||
m_Name: HuaweiSR
|
||||
m_EditorClassIdentifier:
|
||||
m_Active: 0
|
||||
quality: 1
|
||||
spatialUpScaleSettings:
|
||||
sharpness: 0.35
|
||||
--- !u!114 &-2621301742936824463
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
@ -181,7 +192,8 @@ MonoBehaviour:
|
||||
- {fileID: -7390778553674367771}
|
||||
- {fileID: 4395980931634258890}
|
||||
- {fileID: -8043853166483734676}
|
||||
m_RendererFeatureMap: bc3f630842f2e70dd6a559c442a94bfd4529d15534f2d3de228858dca8d12222716523fbf3439fdb7a327b7bff4bdd446ac59dfa966ffa88e5fca93e10ae6e99ca6373cd5da9013d6cff55ca297e5e90
|
||||
- {fileID: -4454652084718109581}
|
||||
m_RendererFeatureMap: bc3f630842f2e70dd6a559c442a94bfd4529d15534f2d3de228858dca8d12222716523fbf3439fdb7a327b7bff4bdd446ac59dfa966ffa88e5fca93e10ae6e99ca6373cd5da9013d6cff55ca297e5e90737c6cdc87e52dc2
|
||||
m_UseNativeRenderPass: 0
|
||||
postProcessData: {fileID: 11400000, guid: 41439944d30ece34e96484bdb6645b55, type: 2}
|
||||
shaders:
|
||||
|
||||
@ -412,6 +412,9 @@ void RenderAPI_OpenGLCoreES::spatialUpScale(void *data)
|
||||
float sharpness;
|
||||
uint32_t render_width;
|
||||
uint32_t render_height;
|
||||
uint32_t upscale_width;
|
||||
uint32_t upscale_height;
|
||||
|
||||
};
|
||||
DataPack* data_pack = static_cast<DataPack*>(data);
|
||||
if (data_pack->data != NULL)
|
||||
@ -423,17 +426,17 @@ void RenderAPI_OpenGLCoreES::spatialUpScale(void *data)
|
||||
// upscaleScissor为超分输入图像的采样区域
|
||||
int upscaleScissor[4] = {0, 0, static_cast<int>(param->render_width), static_cast<int>(param->render_height)};
|
||||
HMS_XEG_SpatialUpscaleParameter(XEG_SPATIAL_UPSCALE_SCISSOR, upscaleScissor);
|
||||
GLuint gl_srctex = (GLuint)(size_t)(data_pack->src);
|
||||
|
||||
// TODO: 测试由上层设置
|
||||
GLuint gl_dsttex = (GLuint)(size_t)(data_pack->dst);
|
||||
// // upscaleFBO为用户自定义创建的framebuffer
|
||||
glBindFramebuffer(GL_FRAMEBUFFER, gl_dsttex);
|
||||
glViewport(0, 0, param->upscale_width, param->upscale_height);
|
||||
glScissor(0, 0, param->upscale_width, param->upscale_height);
|
||||
|
||||
HMS_XEG_RenderSpatialUpscale(gl_srctex);
|
||||
}
|
||||
GLuint gl_srctex = (GLuint)(size_t)(data_pack->src);
|
||||
|
||||
// TODO: 测试由上层设置
|
||||
// GLuint gl_dsttex = (GLuint)(size_t)(data_pack->dst);
|
||||
// // upscaleFBO为用户自定义创建的framebuffer
|
||||
// glBindFramebuffer(GL_FRAMEBUFFER, gl_dsttex);
|
||||
// glViewport(0, 0, upscale_width, upscale_height);
|
||||
// glScissor(0, 0, upscale_width, upscale_height);
|
||||
|
||||
HMS_XEG_RenderSpatialUpscale(gl_srctex);
|
||||
#endif
|
||||
}
|
||||
|
||||
|
||||
@ -103,6 +103,7 @@ target("GfxPluginNativeRender")
|
||||
|
||||
if is_plat("harmonyos") then
|
||||
add_links("xengine")
|
||||
add_ldflags("-fPIE", "-fPIC")
|
||||
add_links("framegeneration")
|
||||
add_defines("OHOS=1")
|
||||
end
|
||||
@ -146,6 +147,8 @@ toolchain("ohndk")
|
||||
toolchain:add("ldflags", "-fPIE")
|
||||
toolchain:add("ldflags", "-pie")
|
||||
|
||||
toolchain:add("ldflags", "-fPIC")
|
||||
|
||||
-- add some builtin flags
|
||||
toolchain:add("cxflags", "-D__MUSL__")
|
||||
|
||||
|
||||
@ -512,6 +512,7 @@ namespace UnityEngine.Rendering.Universal
|
||||
{
|
||||
colorDescriptor.enableRandomWrite = true;
|
||||
}
|
||||
colorDescriptor.enableRandomWrite = true;
|
||||
if (asset.SuperResolution == ESuperResolution.XESS13)
|
||||
{
|
||||
colorDescriptor.graphicsFormat = GraphicsFormat.R16G16B16A16_SFloat;
|
||||
|
||||
8
Packages/com.unity.render-pipelines.universal@14.0.11/Runtime/Plugins/OpenHarmony.meta
vendored
Normal file
8
Packages/com.unity.render-pipelines.universal@14.0.11/Runtime/Plugins/OpenHarmony.meta
vendored
Normal file
@ -0,0 +1,8 @@
|
||||
fileFormatVersion: 2
|
||||
guid: DHpNti+oUirNF2tvS3naa2hMxyDIh3eOEsMwGWjWaE3v358MM07f17k=
|
||||
folderAsset: yes
|
||||
DefaultImporter:
|
||||
externalObjects: {}
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
||||
Binary file not shown.
@ -0,0 +1,79 @@
|
||||
fileFormatVersion: 2
|
||||
guid: Wn1MsnmpVnztDIGlc1D1qXyU+AhqJr6M7j9DPtwxEp93Qg8ezZpLh3A=
|
||||
PluginImporter:
|
||||
externalObjects: {}
|
||||
serializedVersion: 2
|
||||
iconMap: {}
|
||||
executionOrder: {}
|
||||
defineConstraints: []
|
||||
isPreloaded: 1
|
||||
isOverridable: 1
|
||||
isExplicitlyReferenced: 0
|
||||
validateReferences: 1
|
||||
platformData:
|
||||
- first:
|
||||
: Any
|
||||
second:
|
||||
enabled: 0
|
||||
settings:
|
||||
Exclude Android: 1
|
||||
Exclude Editor: 1
|
||||
Exclude Linux64: 1
|
||||
Exclude OSXUniversal: 1
|
||||
Exclude OpenHarmony: 0
|
||||
Exclude Win: 1
|
||||
Exclude Win64: 1
|
||||
- first:
|
||||
Android: Android
|
||||
second:
|
||||
enabled: 0
|
||||
settings:
|
||||
AndroidSharedLibraryType: Executable
|
||||
CPU: ARMv7
|
||||
- first:
|
||||
Any:
|
||||
second:
|
||||
enabled: 0
|
||||
settings: {}
|
||||
- first:
|
||||
Editor: Editor
|
||||
second:
|
||||
enabled: 0
|
||||
settings:
|
||||
CPU: AnyCPU
|
||||
DefaultValueInitialized: true
|
||||
OS: AnyOS
|
||||
- first:
|
||||
OpenHarmony: OpenHarmony
|
||||
second:
|
||||
enabled: 1
|
||||
settings:
|
||||
CPU: ARM64
|
||||
OpenHarmonySharedLibraryType: Symbol
|
||||
- first:
|
||||
Standalone: Linux64
|
||||
second:
|
||||
enabled: 0
|
||||
settings:
|
||||
CPU: None
|
||||
- first:
|
||||
Standalone: OSXUniversal
|
||||
second:
|
||||
enabled: 0
|
||||
settings:
|
||||
CPU: None
|
||||
- first:
|
||||
Standalone: Win
|
||||
second:
|
||||
enabled: 0
|
||||
settings:
|
||||
CPU: None
|
||||
- first:
|
||||
Standalone: Win64
|
||||
second:
|
||||
enabled: 0
|
||||
settings:
|
||||
CPU: None
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
||||
@ -1,5 +1,5 @@
|
||||
fileFormatVersion: 2
|
||||
guid: 5f2d1973ed81cfa48a2454937af74b84
|
||||
guid: Ciwd4SukVHjmo3sbv6mbRQOAS8tMmDtogzuA8jtsvh3tUelT2TDaMkM=
|
||||
PluginImporter:
|
||||
externalObjects: {}
|
||||
serializedVersion: 2
|
||||
@ -11,17 +11,69 @@ PluginImporter:
|
||||
isExplicitlyReferenced: 0
|
||||
validateReferences: 1
|
||||
platformData:
|
||||
- first:
|
||||
: Any
|
||||
second:
|
||||
enabled: 0
|
||||
settings:
|
||||
Exclude Android: 1
|
||||
Exclude Editor: 1
|
||||
Exclude Linux64: 0
|
||||
Exclude OSXUniversal: 0
|
||||
Exclude OpenHarmony: 1
|
||||
Exclude Win: 0
|
||||
Exclude Win64: 0
|
||||
- first:
|
||||
Android: Android
|
||||
second:
|
||||
enabled: 0
|
||||
settings:
|
||||
AndroidSharedLibraryType: Executable
|
||||
CPU: ARMv7
|
||||
- first:
|
||||
Any:
|
||||
second:
|
||||
enabled: 1
|
||||
enabled: 0
|
||||
settings: {}
|
||||
- first:
|
||||
Editor: Editor
|
||||
second:
|
||||
enabled: 0
|
||||
settings:
|
||||
CPU: AnyCPU
|
||||
DefaultValueInitialized: true
|
||||
OS: AnyOS
|
||||
- first:
|
||||
OpenHarmony: OpenHarmony
|
||||
second:
|
||||
enabled: 0
|
||||
settings:
|
||||
CPU: ARMv7
|
||||
OpenHarmonySharedLibraryType: Executable
|
||||
- first:
|
||||
Standalone: Linux64
|
||||
second:
|
||||
enabled: 1
|
||||
settings:
|
||||
CPU: None
|
||||
- first:
|
||||
Standalone: OSXUniversal
|
||||
second:
|
||||
enabled: 1
|
||||
settings:
|
||||
CPU: None
|
||||
- first:
|
||||
Standalone: Win
|
||||
second:
|
||||
enabled: 1
|
||||
settings:
|
||||
CPU: None
|
||||
- first:
|
||||
Standalone: Win64
|
||||
second:
|
||||
enabled: 1
|
||||
settings:
|
||||
CPU: None
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
||||
|
||||
@ -1,5 +1,5 @@
|
||||
fileFormatVersion: 2
|
||||
guid: 4cb43d44daaa0754ab8d56c6424aa456
|
||||
guid: CylNsSn5V385rwZDZ0c3ZH2bVn7sAt4uXYM3ovG+CFkMBMj6NWTM5h0=
|
||||
PluginImporter:
|
||||
externalObjects: {}
|
||||
serializedVersion: 2
|
||||
@ -11,17 +11,69 @@ PluginImporter:
|
||||
isExplicitlyReferenced: 0
|
||||
validateReferences: 1
|
||||
platformData:
|
||||
- first:
|
||||
: Any
|
||||
second:
|
||||
enabled: 0
|
||||
settings:
|
||||
Exclude Android: 1
|
||||
Exclude Editor: 1
|
||||
Exclude Linux64: 0
|
||||
Exclude OSXUniversal: 0
|
||||
Exclude OpenHarmony: 1
|
||||
Exclude Win: 1
|
||||
Exclude Win64: 0
|
||||
- first:
|
||||
Android: Android
|
||||
second:
|
||||
enabled: 0
|
||||
settings:
|
||||
AndroidSharedLibraryType: Executable
|
||||
CPU: ARMv7
|
||||
- first:
|
||||
Any:
|
||||
second:
|
||||
enabled: 1
|
||||
enabled: 0
|
||||
settings: {}
|
||||
- first:
|
||||
Editor: Editor
|
||||
second:
|
||||
enabled: 0
|
||||
settings:
|
||||
CPU: AnyCPU
|
||||
DefaultValueInitialized: true
|
||||
OS: AnyOS
|
||||
- first:
|
||||
OpenHarmony: OpenHarmony
|
||||
second:
|
||||
enabled: 0
|
||||
settings:
|
||||
CPU: ARMv7
|
||||
OpenHarmonySharedLibraryType: Executable
|
||||
- first:
|
||||
Standalone: Linux64
|
||||
second:
|
||||
enabled: 1
|
||||
settings:
|
||||
CPU: AnyCPU
|
||||
- first:
|
||||
Standalone: OSXUniversal
|
||||
second:
|
||||
enabled: 1
|
||||
settings:
|
||||
CPU: AnyCPU
|
||||
- first:
|
||||
Standalone: Win
|
||||
second:
|
||||
enabled: 0
|
||||
settings:
|
||||
CPU: AnyCPU
|
||||
- first:
|
||||
Standalone: Win64
|
||||
second:
|
||||
enabled: 1
|
||||
settings:
|
||||
CPU: AnyCPU
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
||||
|
||||
@ -7,21 +7,21 @@ namespace X.Rendering.Feature
|
||||
{
|
||||
public static class RenderingPlugin
|
||||
{
|
||||
#if (PLATFORM_IOS || PLATFORM_TVOS || PLATFORM_BRATWURST ) && !UNITY_EDITOR
|
||||
#if (PLATFORM_IOS || PLATFORM_TVOS || PLATFORM_BRATWURST) && !UNITY_EDITOR
|
||||
[DllImport("__Internal")]
|
||||
#else
|
||||
[DllImport("GfxPluginNativeRender")]
|
||||
#endif
|
||||
public static extern IntPtr GetRenderEventAndDataFunc();
|
||||
|
||||
#if (PLATFORM_IOS || PLATFORM_TVOS || PLATFORM_BRATWURST ) && !UNITY_EDITOR
|
||||
#if (PLATFORM_IOS || PLATFORM_TVOS || PLATFORM_BRATWURST) && !UNITY_EDITOR
|
||||
[DllImport("__Internal")]
|
||||
#else
|
||||
[DllImport("GfxPluginNativeRender")]
|
||||
#endif
|
||||
private static extern bool GetFeatureSupport(int feature);
|
||||
|
||||
#if (PLATFORM_IOS || PLATFORM_TVOS || PLATFORM_BRATWURST ) && !UNITY_EDITOR
|
||||
#if (PLATFORM_IOS || PLATFORM_TVOS || PLATFORM_BRATWURST) && !UNITY_EDITOR
|
||||
[DllImport("__Internal")]
|
||||
#else
|
||||
[DllImport("GfxPluginNativeRender")]
|
||||
|
||||
@ -1,3 +1,5 @@
|
||||
using System;
|
||||
using System.Runtime.InteropServices;
|
||||
using UnityEngine;
|
||||
using UnityEngine.Rendering;
|
||||
using UnityEngine.Rendering.Universal;
|
||||
@ -9,15 +11,32 @@ namespace X.Rendering.Feature
|
||||
[SerializeField]
|
||||
SrQuality quality;
|
||||
private ProfilingSampler profiler;
|
||||
private ESuperResolution superResolution;
|
||||
|
||||
[Serializable]
|
||||
internal class HWSpatialUpScaleSettings
|
||||
{
|
||||
public float sharpness;
|
||||
}
|
||||
|
||||
[SerializeField]
|
||||
private HWSpatialUpScaleSettings spatialUpScaleSettings;
|
||||
|
||||
HWSpatialUpScale hwSpatialUpScale;
|
||||
public override void AddRenderPasses(ScriptableRenderer renderer, ref RenderingData renderingData)
|
||||
{
|
||||
}
|
||||
|
||||
public override void Create()
|
||||
{
|
||||
profiler = new ProfilingSampler("HuaweiSR");
|
||||
profiler = new ProfilingSampler(nameof(HuaweiSR));
|
||||
hwSpatialUpScale = new HWSpatialUpScale(spatialUpScaleSettings);
|
||||
}
|
||||
|
||||
protected override void Dispose(bool disposing)
|
||||
{
|
||||
base.Dispose(disposing);
|
||||
hwSpatialUpScale.Dispose();
|
||||
}
|
||||
|
||||
public void DoSR(CommandBuffer cmd, RTHandle source, RTHandle destination, RTHandle motionVector, ref RenderingData renderingData)
|
||||
@ -29,7 +48,10 @@ namespace X.Rendering.Feature
|
||||
using var scp = new ProfilingScope(cmd, profiler);
|
||||
|
||||
//SuperResolutionParamSets.Instance.Set<bool>("NeedJitter", true);
|
||||
|
||||
if (superResolution == ESuperResolution.HW_SPATIAL_SR)
|
||||
{
|
||||
hwSpatialUpScale.DoSR(cmd, source, destination, motionVector, ref renderingData);
|
||||
}
|
||||
}
|
||||
|
||||
public float GetRenderScale()
|
||||
@ -39,6 +61,70 @@ namespace X.Rendering.Feature
|
||||
|
||||
public void SetSR(ESuperResolution resolution)
|
||||
{
|
||||
superResolution = resolution;
|
||||
switch (resolution)
|
||||
{
|
||||
case ESuperResolution.HW_SPATIAL_SR:
|
||||
case ESuperResolution.HW_AISR:
|
||||
{
|
||||
SetActive(true);
|
||||
}
|
||||
break;
|
||||
default:
|
||||
SetActive(false);
|
||||
break;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
internal unsafe sealed class HWSpatialUpScale : IDisposable
|
||||
{
|
||||
[StructLayout(LayoutKind.Sequential)]
|
||||
struct HWSpatialSRParam
|
||||
{
|
||||
public float sharpness;
|
||||
public uint render_width;
|
||||
public uint render_height;
|
||||
};
|
||||
|
||||
[StructLayout(LayoutKind.Sequential)]
|
||||
struct DataPack
|
||||
{
|
||||
public IntPtr src;
|
||||
public HWSpatialSRParam* data;
|
||||
public IntPtr dst;
|
||||
};
|
||||
IntPtr dataPtr;
|
||||
IntPtr paramPtr;
|
||||
private ProfilingSampler profiler;
|
||||
|
||||
public HuaweiSR.HWSpatialUpScaleSettings SpatialUpScaleSettings { get; }
|
||||
|
||||
internal HWSpatialUpScale(HuaweiSR.HWSpatialUpScaleSettings spatialUpScaleSettings)
|
||||
{
|
||||
dataPtr = Marshal.AllocHGlobal(sizeof(DataPack));
|
||||
paramPtr = Marshal.AllocHGlobal(sizeof(HWSpatialSRParam));
|
||||
profiler = new ProfilingSampler(nameof(HWSpatialUpScale));
|
||||
SpatialUpScaleSettings = spatialUpScaleSettings;
|
||||
}
|
||||
|
||||
public void DoSR(CommandBuffer cmd, RTHandle source, RTHandle destination, RTHandle motionVector, ref RenderingData renderingData)
|
||||
{
|
||||
using var scp = new ProfilingScope(cmd, profiler);
|
||||
DataPack* ptr = (DataPack*)dataPtr.ToPointer();
|
||||
ptr->data = (HWSpatialSRParam*)paramPtr.ToPointer();
|
||||
ptr->data->sharpness = SpatialUpScaleSettings.sharpness;
|
||||
ptr->data->render_width = (uint)source.referenceSize.x;
|
||||
ptr->data->render_height = (uint)source.referenceSize.y;
|
||||
ptr->src = source.rt.GetNativeTexturePtr();
|
||||
ptr->dst = destination.rt.GetNativeTexturePtr();
|
||||
cmd.IssuePluginEventAndData(RenderingPlugin.GetRenderEventAndDataFunc(), (int)RenderingPlugin.NativeRenderingEvent.SpatialUpScale, dataPtr);
|
||||
}
|
||||
|
||||
public void Dispose()
|
||||
{
|
||||
Marshal.FreeHGlobal(dataPtr);
|
||||
Marshal.FreeHGlobal(paramPtr);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@ -1,5 +1,6 @@
|
||||
{
|
||||
"dependencies": {
|
||||
"com.unity.burst": "1.8.18",
|
||||
"com.unity.cinemachine": "2.10.1",
|
||||
"com.unity.collab-proxy": "2.5.2",
|
||||
"com.unity.ide.rider": "3.0.31",
|
||||
|
||||
@ -2,13 +2,13 @@
|
||||
"dependencies": {
|
||||
"com.unity.burst": {
|
||||
"version": "1.8.18",
|
||||
"depth": 1,
|
||||
"depth": 0,
|
||||
"source": "registry",
|
||||
"dependencies": {
|
||||
"com.unity.mathematics": "1.2.1",
|
||||
"com.unity.modules.jsonserialize": "1.0.0"
|
||||
},
|
||||
"url": "https://packages.unity.cn"
|
||||
"url": "https://packages.tuanjie.cn"
|
||||
},
|
||||
"com.unity.cinemachine": {
|
||||
"version": "2.10.1",
|
||||
@ -17,28 +17,28 @@
|
||||
"dependencies": {
|
||||
"com.unity.test-framework": "1.1.31"
|
||||
},
|
||||
"url": "https://packages.unity.cn"
|
||||
"url": "https://packages.tuanjie.cn"
|
||||
},
|
||||
"com.unity.collab-proxy": {
|
||||
"version": "2.5.2",
|
||||
"depth": 0,
|
||||
"source": "registry",
|
||||
"dependencies": {},
|
||||
"url": "https://packages.unity.cn"
|
||||
"url": "https://packages.tuanjie.cn"
|
||||
},
|
||||
"com.unity.editorcoroutines": {
|
||||
"version": "1.0.0",
|
||||
"depth": 1,
|
||||
"source": "registry",
|
||||
"dependencies": {},
|
||||
"url": "https://packages.unity.cn"
|
||||
"url": "https://packages.tuanjie.cn"
|
||||
},
|
||||
"com.unity.ext.nunit": {
|
||||
"version": "1.0.6",
|
||||
"depth": 1,
|
||||
"source": "registry",
|
||||
"dependencies": {},
|
||||
"url": "https://packages.unity.cn"
|
||||
"url": "https://packages.tuanjie.cn"
|
||||
},
|
||||
"com.unity.ide.rider": {
|
||||
"version": "3.0.31",
|
||||
@ -47,7 +47,7 @@
|
||||
"dependencies": {
|
||||
"com.unity.ext.nunit": "1.0.6"
|
||||
},
|
||||
"url": "https://packages.unity.cn"
|
||||
"url": "https://packages.tuanjie.cn"
|
||||
},
|
||||
"com.unity.ide.visualstudio": {
|
||||
"version": "2.0.22",
|
||||
@ -56,14 +56,14 @@
|
||||
"dependencies": {
|
||||
"com.unity.test-framework": "1.1.9"
|
||||
},
|
||||
"url": "https://packages.unity.cn"
|
||||
"url": "https://packages.tuanjie.cn"
|
||||
},
|
||||
"com.unity.ide.vscode": {
|
||||
"version": "1.2.5",
|
||||
"depth": 0,
|
||||
"source": "registry",
|
||||
"dependencies": {},
|
||||
"url": "https://packages.unity.cn"
|
||||
"url": "https://packages.tuanjie.cn"
|
||||
},
|
||||
"com.unity.inputsystem": {
|
||||
"version": "1.11.0",
|
||||
@ -72,7 +72,7 @@
|
||||
"dependencies": {
|
||||
"com.unity.modules.uielements": "1.0.0"
|
||||
},
|
||||
"url": "https://packages.unity.cn"
|
||||
"url": "https://packages.tuanjie.cn"
|
||||
},
|
||||
"com.unity.learn.iet-framework": {
|
||||
"version": "3.1.3",
|
||||
@ -82,14 +82,14 @@
|
||||
"com.unity.editorcoroutines": "1.0.0",
|
||||
"com.unity.settings-manager": "1.0.3"
|
||||
},
|
||||
"url": "https://packages.unity.cn"
|
||||
"url": "https://packages.tuanjie.cn"
|
||||
},
|
||||
"com.unity.mathematics": {
|
||||
"version": "1.2.6",
|
||||
"depth": 1,
|
||||
"source": "registry",
|
||||
"dependencies": {},
|
||||
"url": "https://packages.unity.cn"
|
||||
"url": "https://packages.tuanjie.cn"
|
||||
},
|
||||
"com.unity.memoryprofiler": {
|
||||
"version": "1.1.1",
|
||||
@ -98,7 +98,7 @@
|
||||
"dependencies": {
|
||||
"com.unity.editorcoroutines": "1.0.0"
|
||||
},
|
||||
"url": "https://packages.unity.cn"
|
||||
"url": "https://packages.tuanjie.cn"
|
||||
},
|
||||
"com.unity.recorder": {
|
||||
"version": "4.0.3",
|
||||
@ -107,7 +107,7 @@
|
||||
"dependencies": {
|
||||
"com.unity.timeline": "1.0.0"
|
||||
},
|
||||
"url": "https://packages.unity.cn"
|
||||
"url": "https://packages.tuanjie.cn"
|
||||
},
|
||||
"com.unity.render-pipelines.core": {
|
||||
"version": "14.0.11",
|
||||
@ -145,14 +145,14 @@
|
||||
"depth": 2,
|
||||
"source": "registry",
|
||||
"dependencies": {},
|
||||
"url": "https://packages.unity.cn"
|
||||
"url": "https://packages.tuanjie.cn"
|
||||
},
|
||||
"com.unity.settings-manager": {
|
||||
"version": "2.0.1",
|
||||
"depth": 1,
|
||||
"source": "registry",
|
||||
"dependencies": {},
|
||||
"url": "https://packages.unity.cn"
|
||||
"url": "https://packages.tuanjie.cn"
|
||||
},
|
||||
"com.unity.shadergraph": {
|
||||
"version": "14.0.11",
|
||||
@ -172,7 +172,7 @@
|
||||
"com.unity.mathematics": "1.2.1",
|
||||
"com.unity.ugui": "1.0.0"
|
||||
},
|
||||
"url": "https://packages.unity.cn"
|
||||
"url": "https://packages.tuanjie.cn"
|
||||
},
|
||||
"com.unity.test-framework": {
|
||||
"version": "1.1.33",
|
||||
@ -183,7 +183,7 @@
|
||||
"com.unity.modules.imgui": "1.0.0",
|
||||
"com.unity.modules.jsonserialize": "1.0.0"
|
||||
},
|
||||
"url": "https://packages.unity.cn"
|
||||
"url": "https://packages.tuanjie.cn"
|
||||
},
|
||||
"com.unity.textmeshpro": {
|
||||
"version": "3.0.7",
|
||||
@ -192,7 +192,7 @@
|
||||
"dependencies": {
|
||||
"com.unity.ugui": "1.0.0"
|
||||
},
|
||||
"url": "https://packages.unity.cn"
|
||||
"url": "https://packages.tuanjie.cn"
|
||||
},
|
||||
"com.unity.timeline": {
|
||||
"version": "1.7.6",
|
||||
@ -204,7 +204,7 @@
|
||||
"com.unity.modules.audio": "1.0.0",
|
||||
"com.unity.modules.particlesystem": "1.0.0"
|
||||
},
|
||||
"url": "https://packages.unity.cn"
|
||||
"url": "https://packages.tuanjie.cn"
|
||||
},
|
||||
"com.unity.ugui": {
|
||||
"version": "1.0.0",
|
||||
@ -237,7 +237,10 @@
|
||||
"version": "1.0.0",
|
||||
"depth": 0,
|
||||
"source": "builtin",
|
||||
"dependencies": {}
|
||||
"dependencies": {
|
||||
"com.unity.modules.audio": "1.0.0",
|
||||
"com.unity.modules.animation": "1.0.0"
|
||||
}
|
||||
},
|
||||
"com.unity.modules.audio": {
|
||||
"version": "1.0.0",
|
||||
|
||||
@ -1,5 +1,5 @@
|
||||
%YAML 1.1
|
||||
%TAG !u! tag:unity3d.com,2011:
|
||||
%TAG !u! tag:yousandi.cn,2023:
|
||||
--- !u!1045 &1
|
||||
EditorBuildSettings:
|
||||
m_ObjectHideFlags: 0
|
||||
@ -13,3 +13,10 @@ EditorBuildSettings:
|
||||
com.unity.input.settings: {fileID: 11400000, guid: 9e7be553448fa2546aea5752021cbcf7, type: 2}
|
||||
com.unity.xr.management.loader_settings: {fileID: 11400000, guid: 4c1640683c539c14080cfd43fbeffbda, type: 2}
|
||||
xr.sdk.mock-hmd.settings: {fileID: 11400000, guid: 9e9f2958d1b4b4642ace1d0c7770650b, type: 2}
|
||||
m_SlimFeaturesWeixinMiniGame:
|
||||
AllocateOverhead: 1
|
||||
DecompressASTC: 0
|
||||
DecompressDXT: 1
|
||||
DecompressETC: 1
|
||||
FreeTypeSfntPng: 1
|
||||
LightProbe: 2
|
||||
|
||||
@ -780,7 +780,7 @@ PlayerSettings:
|
||||
m_Automatic: 0
|
||||
- m_BuildTarget: OpenHarmonyPlayer
|
||||
m_APIs: 0b00000015000000
|
||||
m_Automatic: 1
|
||||
m_Automatic: 0
|
||||
m_BuildTargetVRSettings: []
|
||||
m_DefaultShaderChunkSizeInMB: 16
|
||||
m_DefaultShaderChunkCount: 8
|
||||
@ -790,6 +790,7 @@ PlayerSettings:
|
||||
m_TemplateCustomTags: {}
|
||||
mobileMTRendering:
|
||||
Android: 1
|
||||
OpenHarmony: 1
|
||||
iPhone: 1
|
||||
tvOS: 1
|
||||
m_BuildTargetGroupLightmapEncodingQuality:
|
||||
@ -1180,7 +1181,7 @@ PlayerSettings:
|
||||
hmiCpuConfiguration:
|
||||
openHarmonySplashScreen: {fileID: 0}
|
||||
openHarmonySplashScreenScale: 0
|
||||
OpenHarmonyTargetArchitectures: 6
|
||||
OpenHarmonyTargetArchitectures: 2
|
||||
openHarmonyClientID:
|
||||
openHarmonyAppID:
|
||||
openHarmonyDeviceTypes: 7
|
||||
@ -1190,11 +1191,11 @@ PlayerSettings:
|
||||
forceOpenHarmonySDCardPermission: 0
|
||||
openHarmonyUseLowAccuracyLocation: 0
|
||||
openHarmonyPredefinedPermissions: []
|
||||
OpenHarmonyKeystoreName:
|
||||
OpenHarmonyKeyaliasName:
|
||||
OpenHarmonyProfile:
|
||||
OpenHarmonyCertificate:
|
||||
OpenHarmonyUseCustomKeystore: 0
|
||||
OpenHarmonyKeystoreName: D:/ohkey.p12
|
||||
OpenHarmonyKeyaliasName: debugkey
|
||||
OpenHarmonyProfile: D:/debugprofileDebug.p7b
|
||||
OpenHarmonyCertificate: D:/debug_key.cer
|
||||
OpenHarmonyUseCustomKeystore: 1
|
||||
apiCompatibilityLevel: 6
|
||||
weixinMiniGameMemorySize: 32
|
||||
weixinMiniGameExceptionSupport: 1
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user