Fix some merge errors

Author: thejudge156

common/src/main/java/org/vivecraft/client/extensions/GlDeviceExtension.java

@@ -14,6 +14,6 @@ public interface GlDeviceExtension {
         @Nullable Supplier<String> labelSup, int usageFlags, TextureFormat textureFormat, int width,
         int height, int depthLayers, int mipmapLevels, int texId);
     GpuTexture vivecraft$precreatedFixedIdTexture(
-        @Nullable Supplier<String> supplier, TextureFormat textureFormat, int width, int height, int mipmapLevels,
-        int texId);
+        @Nullable Supplier<String> labelSup, int usageFlags, TextureFormat textureFormat, int width,
+        int height, int depthLayers, int mipmapLevels, int texId);
 }

common/src/main/java/org/vivecraft/client_vr/VRTextureTarget.java

@@ -47,11 +47,19 @@ public VRTextureTarget(
         if (texId >= 0) {
             // hardcoded opengl here
             if (RenderSystem.getDevice() instanceof GlDevice glDevice) {
-                this.colorTexture = ((GlDeviceExtension) glDevice).vivecraft$createFixedIdTexture(
-                    () -> this.label + " / Color",
-                    GpuTexture.USAGE_COPY_DST | GpuTexture.USAGE_COPY_SRC | GpuTexture.USAGE_TEXTURE_BINDING |
-                        GpuTexture.USAGE_RENDER_ATTACHMENT, TextureFormat.RGBA8, width, height, 1,
-                    mipmaps ? Math.max(Mth.log2(width), Mth.log2(height)) : 1, texId);
+                if(!prePopulated) {
+                    this.colorTexture = ((GlDeviceExtension) glDevice).vivecraft$createFixedIdTexture(
+                        () -> this.label + " / Color",
+                        GpuTexture.USAGE_COPY_DST | GpuTexture.USAGE_COPY_SRC | GpuTexture.USAGE_TEXTURE_BINDING |
+                            GpuTexture.USAGE_RENDER_ATTACHMENT, TextureFormat.RGBA8, width, height, 1,
+                        mipmaps ? Math.max(Mth.log2(width), Mth.log2(height)) : 1, texId);
+                } else {
+                    this.colorTexture = ((GlDeviceExtension) glDevice).vivecraft$precreatedFixedIdTexture(
+                        () -> this.label + " / Color",
+                        GpuTexture.USAGE_COPY_DST | GpuTexture.USAGE_COPY_SRC | GpuTexture.USAGE_TEXTURE_BINDING |
+                            GpuTexture.USAGE_RENDER_ATTACHMENT, TextureFormat.RGBA8, width, height, 1,
+                        mipmaps ? Math.max(Mth.log2(width), Mth.log2(height)) : 1, texId);
+                }
                 this.colorTextureView = glDevice.createTextureView(this.colorTexture);
                 this.colorTexture.setAddressMode(AddressMode.CLAMP_TO_EDGE);
                 this.setFilterMode(linearFilter ? FilterMode.LINEAR : FilterMode.NEAREST);

common/src/main/java/org/vivecraft/mixin/client/blaze3d/opengl/GlDeviceMixin.java

@@ -74,8 +74,8 @@ public class GlDeviceMixin implements GlDeviceExtension {
 
     @Override
     public GpuTexture vivecraft$precreatedFixedIdTexture(
-        @Nullable Supplier<String> labelSup, TextureFormat textureFormat, int width,
-        int height, int mipmapLevels, int texId)
+        @Nullable Supplier<String> labelSup, int usageFlags, TextureFormat textureFormat, int width,
+        int height, int depthLayers, int mipmapLevels, int texId)
     {
         if (mipmapLevels < 1) {
             throw new IllegalArgumentException("mipLevels must be at least 1");
@@ -86,7 +86,7 @@ public class GlDeviceMixin implements GlDeviceExtension {
                 label = String.valueOf(texId);
             }
 
-            GlTexture glTexture = new GlTexture(label, textureFormat, width, height, mipmapLevels, texId);
+            GlTexture glTexture = new GlTexture(usageFlags, label, textureFormat, width, height, depthLayers, mipmapLevels, texId);
             this.debugLabels.applyLabel(glTexture);
             return glTexture;
         }