Improved texture compatibility

xCollateral · Oct 26, 2023 · f89d925 · f89d925
1 parent fd6becc
commit f89d925
Show file tree

Hide file tree

Showing 6 changed files with 44 additions and 17 deletions.
diff --git a/src/main/java/net/vulkanmod/gl/GlTexture.java b/src/main/java/net/vulkanmod/gl/GlTexture.java
@@ -28,12 +28,12 @@ public static int genTextureId() {
         return id;
     }
 
-    public static void bindTexture(int i) {
-        if(i == -1)
+    public static void bindTexture(int id) {
+        if(id == -1)
             return;
 
-        boundTextureId = i;
-        boundTexture = map.get(i);
+        boundTextureId = id;
+        boundTexture = map.get(id);
 
         if(boundTexture == null)
             throw new NullPointerException("bound texture is null");
@@ -90,6 +90,10 @@ public static void setVulkanImage(int id, VulkanImage vulkanImage) {
         texture.vulkanImage = vulkanImage;
     }
 
+    public static GlTexture getBoundTexture() {
+        return boundTexture;
+    }
+
     final int id;
     VulkanImage vulkanImage;
     int internalFormat;
@@ -130,6 +134,14 @@ private void uploadImage(@Nullable ByteBuffer pixels) {
         }
     }
 
+    public VulkanImage getVulkanImage() {
+        return vulkanImage;
+    }
+
+    public void setVulkanImage(VulkanImage vulkanImage) {
+        this.vulkanImage = vulkanImage;
+    }
+
     private static int vulkanFormat(int glFormat, int type) {
         return switch (glFormat) {
             case GL11.GL_RGBA ->

diff --git a/src/main/java/net/vulkanmod/interfaces/VAbstractTextureI.java b/src/main/java/net/vulkanmod/interfaces/VAbstractTextureI.java
@@ -4,11 +4,11 @@
 
 public interface VAbstractTextureI {
 
-    public void bindTexture();
+    void bindTexture();
 
     void setId(int i);
 
-    public VulkanImage getVulkanImage();
+    VulkanImage getVulkanImage();
 
-    public void setVulkanImage(VulkanImage image);
+    void setVulkanImage(VulkanImage image);
 }
diff --git a/src/main/java/net/vulkanmod/mixin/render/RenderSystemMixin.java b/src/main/java/net/vulkanmod/mixin/render/RenderSystemMixin.java
@@ -51,12 +51,11 @@ public static void assertOnGameThreadOrInit() {
     @Overwrite
     public static void _setShaderTexture(int i, ResourceLocation location) {
         if (i >= 0 && i < shaderTextures.length) {
-            TextureManager texturemanager = Minecraft.getInstance().getTextureManager();
-            AbstractTexture abstracttexture = texturemanager.getTexture(location);
-            //abstracttexture.bindTexture();
-            VTextureSelector.bindTexture(i, ((VAbstractTextureI)abstracttexture).getVulkanImage());
+            TextureManager textureManager = Minecraft.getInstance().getTextureManager();
+            AbstractTexture abstractTexture = textureManager.getTexture(location);
+            abstractTexture.bind();
 
-            //shaderTextures[i] = abstracttexture.getId();
+            //shaderTextures[i] = abstractTexture.getId();
         }
 
     }

diff --git a/src/main/java/net/vulkanmod/mixin/texture/MAbstractTexture.java b/src/main/java/net/vulkanmod/mixin/texture/MAbstractTexture.java
@@ -71,8 +71,6 @@ public void bindTexture() {
 
         if (vulkanImage != null)
             VTextureSelector.bindTexture(vulkanImage);
-        else
-            VTextureSelector.bindTexture(VTextureSelector.getWhiteTexture());
     }
 
     public VulkanImage getVulkanImage() {

diff --git a/src/main/java/net/vulkanmod/mixin/texture/MTextureUtil.java b/src/main/java/net/vulkanmod/mixin/texture/MTextureUtil.java
@@ -1,10 +1,10 @@
 package net.vulkanmod.mixin.texture;
 
-import com.mojang.blaze3d.platform.GlStateManager;
 import com.mojang.blaze3d.platform.NativeImage;
 import com.mojang.blaze3d.platform.TextureUtil;
-import com.mojang.blaze3d.systems.RenderSystem;
 import net.vulkanmod.gl.GlTexture;
+import net.vulkanmod.vulkan.texture.VTextureSelector;
+import net.vulkanmod.vulkan.texture.VulkanImage;
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.Overwrite;
 
@@ -23,5 +23,22 @@ public static int generateTextureId() {
      * @author
      */
     @Overwrite(remap = false)
-    public static void prepareImage(NativeImage.InternalGlFormat internalGlFormat, int id, int j, int k, int l) {}
+    public static void prepareImage(NativeImage.InternalGlFormat internalGlFormat, int id, int mipLevels, int width, int height) {
+        GlTexture.bindTexture(id);
+        GlTexture glTexture = GlTexture.getBoundTexture();
+        VulkanImage image = glTexture.getVulkanImage();
+
+        if(image == null || image.mipLevels != mipLevels || image.width != width || image.height != height) {
+            if(image != null)
+                image.free();
+
+            image = new VulkanImage.Builder(width, height)
+                    .setLinearFiltering(false)
+                    .setClamp(false)
+                    .createVulkanImage();
+
+            glTexture.setVulkanImage(image);
+            VTextureSelector.bindTexture(image);
+        }
+    }
 }
diff --git a/src/main/resources/vulkanmod.mixins.json b/src/main/resources/vulkanmod.mixins.json
@@ -64,6 +64,7 @@
     "texture.MSpriteAtlasTexture",
     "texture.MSpriteContents",
     "texture.MTextureManager",
+    "texture.MTextureUtil",
     "texture.MNativeImage",
 
     "util.ScreenshotRecorderM",