Forráskód Böngészése

Revert "[hl] change for haxe hl.NativeArray for Vector (#1224)" and related commit (#1235)

* Revert "[hl] change for haxe hl.NativeArray for Vector - DX12"

This reverts commit 49f71494a981706d4f5bba2e84cfe9a215e188d8.

* Revert "[hl] change for haxe hl.NativeArray for Vector - DirectX"

This reverts commit 68b78a380fbddecabd5709e57aa7fe8a0c72789d.

* Revert "[hl] change for haxe hl.NativeArray for Vector (#1224)"

This reverts commit df5cf654dbb3d30a1c55a377865b7968c73e0bf1.
Yuxiao Mao 11 hónapja
szülő
commit
34f35682b2

+ 2 - 2
h3d/impl/DX12Driver.hx

@@ -1873,7 +1873,7 @@ class DX12Driver extends h3d.impl.Driver {
 		switch( which ) {
 		case Params:
 			if( shader.paramsSize > 0 ) {
-				var data = #if (haxe_ver < 5.0) hl.Bytes.getArray(buf.params.toData()) #else buf.params.toData().getBytes() #end;
+				var data = hl.Bytes.getArray(buf.params.toData());
 				var dataSize = shader.paramsSize << 4;
 				if( regs.params & 0x100 != 0 ) {
 					// update CBV
@@ -1894,7 +1894,7 @@ class DX12Driver extends h3d.impl.Driver {
 			}
 		case Globals:
 			if( shader.globalsSize > 0 ) {
-				var data = #if (haxe_ver < 5.0) hl.Bytes.getArray(buf.globals.toData()) #else buf.globals.toData().getBytes() #end;
+				var data = hl.Bytes.getArray(buf.globals.toData());
 				var dataSize = shader.globalsSize << 4;
 				if( regs.globals & 0x100 != 0 ) {
 					// update CBV

+ 1 - 1
h3d/impl/DirectXDriver.hx

@@ -1228,7 +1228,7 @@ class DirectXDriver extends h3d.impl.Driver {
 
 	function uploadShaderBuffer( sbuffer : dx.Resource, buffer : haxe.ds.Vector<hxd.impl.Float32>, size : Int, prevContent : hl.Bytes ) {
 		if( size == 0 ) return;
-		var data = #if (haxe_ver < 5.0) hl.Bytes.getArray(buffer.toData()) #else buffer.toData().getBytes() #end;
+		var data = hl.Bytes.getArray(buffer.toData());
 		var bytes = size << 4;
 		if( prevContent != null ) {
 			if( prevContent.compare(0, data, 0, bytes) == 0 )

+ 2 - 4
h3d/impl/GlDriver.hx

@@ -596,8 +596,7 @@ class GlDriver extends Driver {
 		case Globals:
 			if( s.globals != null ) {
 				#if hl
-				var bytes = #if (haxe_ver < 5.0) hl.Bytes.getArray(buf.globals.toData()) #else buf.globals.toData().getBytes() #end;
-				gl.uniform4fv(s.globals, streamData(bytes, 0, s.shader.globalsSize * 16), 0, s.shader.globalsSize * 4);
+				gl.uniform4fv(s.globals, streamData(hl.Bytes.getArray(buf.globals.toData()), 0, s.shader.globalsSize * 16), 0, s.shader.globalsSize * 4);
 				#else
 				var a = buf.globals.subarray(0, s.shader.globalsSize * 4);
 				gl.uniform4fv(s.globals, a);
@@ -606,8 +605,7 @@ class GlDriver extends Driver {
 		case Params:
 			if( s.params != null ) {
 				#if hl
-				var bytes = #if (haxe_ver < 5.0) hl.Bytes.getArray(buf.params.toData()) #else buf.params.toData().getBytes() #end;
-				gl.uniform4fv(s.params, streamData(bytes, 0, s.shader.paramsSize * 16), 0, s.shader.paramsSize * 4);
+				gl.uniform4fv(s.params, streamData(hl.Bytes.getArray(buf.params.toData()), 0, s.shader.paramsSize * 16), 0, s.shader.paramsSize * 4);
 				#else
 				var a = buf.params.subarray(0, s.shader.paramsSize * 4);
 				gl.uniform4fv(s.params, a);

+ 1 - 3
h3d/impl/RenderContext.hx

@@ -178,10 +178,8 @@ class RenderContext {
 	}
 
 	inline function getPtr( data : h3d.shader.Buffers.ShaderBufferData ) {
-		#if (hl && haxe_ver < 5.0)
+		#if hl
 		return (hl.Bytes.getArray((cast data : Array<Single>)) : hl.BytesAccess<hl.F32>);
-		#elseif hl
-		return (data.toData().getBytes() : hl.BytesAccess<hl.F32>);
 		#else
 		return data;
 		#end

+ 1 - 1
hxd/fmt/hmd/Library.hx

@@ -257,7 +257,7 @@ class Library {
 				}
 				buf.indexes[i] = rid - 1;
 			}
-			#if (neko || (hl && haxe_ver >= 5.0))
+			#if neko
 			buf.vertexes = haxe.ds.Vector.fromArrayCopy(vertexes.getNative());
 			#else
 			buf.vertexes = haxe.ds.Vector.fromData(vertexes.getNative());