Browse Source

Fix Texture:getWidth for texture views.

Sasha Szpakowski 1 year ago
parent
commit
3509e651fd
1 changed files with 3 additions and 3 deletions
  1. 3 3
      src/modules/graphics/Texture.cpp

+ 3 - 3
src/modules/graphics/Texture.cpp

@@ -166,8 +166,8 @@ Texture::Texture(Graphics *gfx, const Settings &settings, const Slices *slices)
 	, format(settings.format)
 	, format(settings.format)
 	, renderTarget(settings.renderTarget)
 	, renderTarget(settings.renderTarget)
 	, computeWrite(settings.computeWrite)
 	, computeWrite(settings.computeWrite)
-	, viewFormats(settings.viewFormats)
 	, readable(true)
 	, readable(true)
+	, viewFormats(settings.viewFormats)
 	, mipmapsMode(settings.mipmaps)
 	, mipmapsMode(settings.mipmaps)
 	, width(settings.width)
 	, width(settings.width)
 	, height(settings.height)
 	, height(settings.height)
@@ -336,8 +336,8 @@ Texture::Texture(Graphics *gfx, Texture *base, const ViewSettings &viewsettings)
 	, format(viewsettings.format.get(base->getPixelFormat()))
 	, format(viewsettings.format.get(base->getPixelFormat()))
 	, renderTarget(base->renderTarget)
 	, renderTarget(base->renderTarget)
 	, computeWrite(base->computeWrite)
 	, computeWrite(base->computeWrite)
-	, viewFormats(base->viewFormats)
 	, readable(base->readable)
 	, readable(base->readable)
+	, viewFormats(base->viewFormats)
 	, mipmapsMode(base->mipmapsMode)
 	, mipmapsMode(base->mipmapsMode)
 	, width(1)
 	, width(1)
 	, height(1)
 	, height(1)
@@ -354,7 +354,7 @@ Texture::Texture(Graphics *gfx, Texture *base, const ViewSettings &viewsettings)
 	, rootView({base->rootView.texture, 0, 0})
 	, rootView({base->rootView.texture, 0, 0})
 	, parentView({base, viewsettings.mipmapStart.get(0), viewsettings.layerStart.get(0)})
 	, parentView({base, viewsettings.mipmapStart.get(0), viewsettings.layerStart.get(0)})
 {
 {
-	width = base->getHeight(parentView.startMipmap);
+	width = base->getWidth(parentView.startMipmap);
 	height = base->getHeight(parentView.startMipmap);
 	height = base->getHeight(parentView.startMipmap);
 
 
 	if (texType == TEXTURE_VOLUME)
 	if (texType == TEXTURE_VOLUME)