Merge pull request #3669 from Jesuszilla/new-feats2

fix: HDR data alignment, missing enum definitions & uncompiled geo shader on Android; alpha in HDR images on 3D BGs

Author: K4thos

src/model.go

@@ -363,17 +363,17 @@ func loadEnvironment(filepath string) (*Environment, error) {
 	env.GGXLUT = &GLTFTexture{}
 	if hdrImg, ok := img.(hdr.Image); ok {
 		bounds := img.Bounds()
-		size := bounds.Max.X * bounds.Max.Y * 3
+		size := bounds.Max.X * bounds.Max.Y * 4
 		data := make([]float32, 0, size)
 		for y := bounds.Min.Y; y < bounds.Max.Y; y++ {
 			for x := bounds.Min.X; x < bounds.Max.X; x++ {
 				color := hdrImg.HDRAt(x, y)
-				r, g, b, _ := color.HDRRGBA()
-				data = append(data, float32(r), float32(g), float32(b))
+				r, g, b, a := color.HDRRGBA()
+				data = append(data, float32(r), float32(g), float32(b), float32(a))
 			}
 		}
-		for i, j := 0, len(data)-3; i < j; i, j = i+3, j-3 {
-			data[i], data[i+1], data[i+2], data[j], data[j+1], data[j+2] = data[j], data[j+1], data[j+2], data[i], data[i+1], data[i+2]
+		for i, j := 0, len(data)-4; i < j; i, j = i+4, j-4 {
+			data[i], data[i+1], data[i+2], data[i+3], data[j], data[j+1], data[j+2], data[j+3] = data[j], data[j+1], data[j+2], data[j+3], data[i], data[i+1], data[i+2], data[i+3]
 		}
 		sys.mainThreadTask <- func() {
 			if !gfx.IsModelEnabled() {

src/render_gl33.go

@@ -246,7 +246,7 @@ func (r *Renderer_GL33) newDataTexture(width, height int32) Texture {
 func (r *Renderer_GL33) newHDRTexture(width, height int32) Texture {
 	r.SetActiveTexture0() //gl.ActiveTexture(gl.TEXTURE0)
 
-	t := r.generateTexture(width, height, 96, false)
+	t := r.generateTexture(width, height, 128, false)
 
 	gl.BindTexture(gl.TEXTURE_2D, t.handle)
 	gl.TexParameteri(gl.TEXTURE_2D, gl.TEXTURE_MIN_FILTER, gl.LINEAR)
@@ -263,7 +263,7 @@ func (r *Renderer_GL33) newCubeMapTexture(widthHeight int32, mipmap bool, lowest
 
 	gl.BindTexture(gl.TEXTURE_CUBE_MAP, t.handle)
 	for i := 0; i < 6; i++ {
-		gl.TexImage2D(uint32(gl.TEXTURE_CUBE_MAP_POSITIVE_X+i), 0, gl.RGB32F, widthHeight, widthHeight, 0, gl.RGB, gl.FLOAT, nil)
+		gl.TexImage2D(uint32(gl.TEXTURE_CUBE_MAP_POSITIVE_X+i), 0, gl.RGBA32F, widthHeight, widthHeight, 0, gl.RGBA, gl.FLOAT, nil)
 	}
 
 	if mipmap {

src/render_gles32.go

@@ -59,9 +59,8 @@ func (r *Renderer_GLES32) newShaderProgram(vert, frag, geo, name string, crashWh
 	}
 	Logcat("GLES: Frag Obj created: " + name)
 
-	// IMPORTANT: Geometry shaders are very unstable on GLES 3.2 mobile.
-	// For now, let's force skip them to see if we can reach the main menu.
-	if false && len(geo) > 0 {
+	// Activate the shader if it's there
+	if len(geo) > 0 {
 		if geoObj, err := r.compileShader(gl.GEOMETRY_SHADER, geo); chkEX(err, "Shader compilation error on "+name+"\n", crashWhenFail) {
 			return nil, err
 		} else {
@@ -1169,6 +1168,8 @@ func (r *Renderer_GLES32) MapBlendFunction(i BlendFunc) uint32 {
 		BlendZero:             gl.ZERO,
 		BlendSrcAlpha:         gl.SRC_ALPHA,
 		BlendOneMinusSrcAlpha: gl.ONE_MINUS_SRC_ALPHA,
+		BlendDstColor:         gl.DST_COLOR,
+		BlendOneMinusDstColor: gl.ONE_MINUS_DST_COLOR,
 	}
 	return BlendFunctionLUT[i]
 }
@@ -2219,7 +2220,7 @@ func (r *Renderer_GLES32) RenderLUT(distribution int32, cubeTex Texture, lutTex
 	gl.Uniform1i(loc, 1)
 
 	gl.BindTexture(gl.TEXTURE_2D, lutTexture.handle)
-	gl.TexImage2D(gl.TEXTURE_2D, 0, gl.RGBA32F, lutTexture.width, lutTexture.height, 0, gl.RGBA, gl.FLOAT, nil)
+	gl.TexImage2D(gl.TEXTURE_2D, 0, gl.RGBA16F, lutTexture.width, lutTexture.height, 0, gl.RGBA, gl.HALF_FLOAT, nil)
 
 	gl.FramebufferTexture2D(gl.FRAMEBUFFER, gl.COLOR_ATTACHMENT0, gl.TEXTURE_2D, lutTexture.handle, 0)
 	gl.Clear(gl.COLOR_BUFFER_BIT)

src/render_vk.go

@@ -106,12 +106,12 @@ func (r *Renderer_VK) newDataTexture(width, height int32) Texture {
 	return t
 }
 func (r *Renderer_VK) newHDRTexture(width, height int32) Texture {
-	t := r.newTexture(width, height, 32*3, true) //float
+	t := r.newTexture(width, height, 32*4, true) //float
 	t.(*Texture_VK).sampler = r.GetSampler(VulkanSamplerInfo{TextureSamplingFilterLinear, TextureSamplingFilterLinear, TextureSamplingWrapMirroredRepeat, TextureSamplingWrapMirroredRepeat})
 	return t
 }
 func (r *Renderer_VK) newCubeMapTexture(widthHeight int32, mipmap bool, lowestMipLevel int32) Texture {
-	t := &Texture_VK{widthHeight, widthHeight, 96, false, 1, [2]int32{0, 0}, [4]float32{0, 0, 1, 1}, nil, nil, nil}
+	t := &Texture_VK{widthHeight, widthHeight, 128, false, 1, [2]int32{0, 0}, [4]float32{0, 0, 1, 1}, nil, nil, nil}
 	if mipmap {
 		t.mipLevels = uint32(math.Floor(math.Log2(float64(widthHeight)))+1) - uint32(lowestMipLevel)
 		t.sampler = r.GetSampler(VulkanSamplerInfo{TextureSamplingFilterLinear, TextureSamplingFilterLinearMipMapLinear, TextureSamplingWrapClampToEdge, TextureSamplingWrapClampToEdge})

src/shaders/shadow.frag.glsl

@@ -1,3 +1,7 @@
+#ifdef GL_ES
+	precision highp float; // don't ask why but putting these up here satisfies the compiler
+	precision highp int;
+#endif
 struct Light
 {
 	vec3 direction;

src/shaders/shadow.geo.glsl

@@ -1,3 +1,7 @@
+#ifdef GL_ES
+	precision highp float;
+	precision highp int;
+#endif
 layout(triangle_strip, max_vertices = 18) out;
 uniform int layerOffset;
 #define LAYER_OFFSET layerOffset

src/shaders/shadow.vert.glsl

@@ -66,7 +66,8 @@
 	#define COMPAT_TEXTURE texture
 	#ifdef GL_ES
 		precision highp float;
-		#define GS_IN(x) x
+		precision highp int;
+		#define GS_IN(x) x##In
 	#else
 		#define GS_IN(x) x##In
 	#endif
@@ -88,9 +89,10 @@
 	COMPAT_ATTRIBUTE vec4 weights_0;
 	COMPAT_ATTRIBUTE vec4 weights_1;
 
-	COMPAT_VARYING float GS_IN(vColor);
-	COMPAT_VARYING vec2 GS_IN(texcoord);
-	COMPAT_VARYING vec4 GS_IN(FragPos);
+	// GS_IN(name) causes issues on GLES for some reason, just use them as-is
+	COMPAT_VARYING float vColorIn;
+	COMPAT_VARYING vec2 texcoordIn;
+	COMPAT_VARYING vec4 FragPosIn;
 #endif
 
 
@@ -130,7 +132,11 @@ mat4 getJointMatrix(){
 }
 
 void main() {
+	#ifdef GL_ES
+	texcoordIn = uv;
+	#else
 	GS_IN(texcoord) = uv;
+	#endif
 	#if __VERSION__ >= 450
 		if(useVertColor) {
 			vColor = vertColor.a;
@@ -139,7 +145,11 @@ void main() {
 		}
 		bool skinning = useJoint0;
 	#else
+		#ifdef GL_ES
+		vColorIn = vertColor.a;
+		#else
 		GS_IN(vColor) = vertColor.a;
+		#endif
 		bool skinning = checkSkinning();
 	#endif
 	vec4 pos = vec4(position, 1.0);
@@ -152,15 +162,27 @@ void main() {
 			if(float(idx) < morphTargetOffset[0]){
 				pos += morphTargetWeight[idx/4][idx%4] * COMPAT_TEXTURE(morphTargetValues,xy);
 			}else if(float(idx) >= morphTargetOffset[2] && float(idx) < morphTargetOffset[3]){
+				#ifdef GL_ES
+				texcoordIn += morphTargetWeight[idx/4][idx%4] * vec2(COMPAT_TEXTURE(morphTargetValues,xy));
+				#else
 				GS_IN(texcoord) += morphTargetWeight[idx/4][idx%4] * vec2(COMPAT_TEXTURE(morphTargetValues,xy));
+				#endif
 			}
 		}
 	}
 	if(skinning){
 		mat4 jointMatrix = getJointMatrix();
+		#ifdef GL_ES
+		FragPosIn = model * jointMatrix * pos;
+		#else
 		GS_IN(FragPos) = model * jointMatrix * pos;
+		#endif
 	}else{
+		#ifdef GL_ES
+		FragPosIn = model * pos;
+		#else
 		GS_IN(FragPos) = model * pos;
+		#endif
 	}
 	#if __VERSION__ >= 450
 		gl_Layer = int(layers[gl_InstanceIndex/4][gl_InstanceIndex%4]);
@@ -169,6 +191,10 @@ void main() {
 	#else
 		// GLES PATH: Apply the light matrix and set the final gl_Position
 		// We assume lightIndex is passed as a uniform for GLES
+		#ifdef GL_ES
+		gl_Position = lightMatrix * FragPosIn;
+		#else
 		gl_Position = lightMatrix * GS_IN(FragPos);
+		#endif
 	#endif
 }