Skip to content

Commit

Permalink
[dxvk] Remove createImageView function
Browse files Browse the repository at this point in the history
Use the image's method instead, like we already do for buffers.
  • Loading branch information
doitsujin committed Sep 27, 2024
1 parent a172cab commit 01a7457
Show file tree
Hide file tree
Showing 14 changed files with 14 additions and 35 deletions.
2 changes: 1 addition & 1 deletion src/d3d11/d3d11_context.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -526,7 +526,7 @@ namespace dxvk {
DxvkImageViewCreateInfo info = imageView->info();
info.format = rawFormat;

imageView = m_device->createImageView(imageView->image(), info);
imageView = imageView->image()->createView(info);
}

EmitCs([
Expand Down
2 changes: 1 addition & 1 deletion src/d3d11/d3d11_swapchain.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -617,7 +617,7 @@ namespace dxvk {
viewInfo.numLevels = 1;
viewInfo.minLayer = 0;
viewInfo.numLayers = 1;
m_swapImageView = m_device->createImageView(m_swapImage, viewInfo);
m_swapImageView = m_swapImage->createView(viewInfo);

// Initialize the image so that we can use it. Clearing
// to black prevents garbled output for the first frame.
Expand Down
5 changes: 2 additions & 3 deletions src/d3d11/d3d11_video.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -219,7 +219,7 @@ namespace dxvk {
if (viewInfo.aspect != VK_IMAGE_ASPECT_COLOR_BIT)
viewInfo.format = formatFamily.Formats[i];

m_views[i] = pDevice->GetDXVKDevice()->createImageView(dxvkImage, viewInfo);
m_views[i] = dxvkImage->createView(viewInfo);
}

m_isYCbCr = IsYCbCrFormat(resourceDesc.Format);
Expand Down Expand Up @@ -314,8 +314,7 @@ namespace dxvk {
throw DxvkError("Invalid view dimension");
}

m_view = pDevice->GetDXVKDevice()->createImageView(
GetCommonTexture(pResource)->GetImage(), viewInfo);
m_view = GetCommonTexture(pResource)->GetImage()->createView(viewInfo);
}


Expand Down
3 changes: 1 addition & 2 deletions src/d3d11/d3d11_view_dsv.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -99,8 +99,7 @@ namespace dxvk {
m_info.Image.Aspects &= ~VK_IMAGE_ASPECT_STENCIL_BIT;

// Create the underlying image view object
m_view = pDevice->GetDXVKDevice()->createImageView(
GetCommonTexture(pResource)->GetImage(), viewInfo);
m_view = GetCommonTexture(pResource)->GetImage()->createView(viewInfo);
}


Expand Down
2 changes: 1 addition & 1 deletion src/d3d11/d3d11_view_rtv.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -110,7 +110,7 @@ namespace dxvk {
m_info.Image.NumLayers = viewInfo.numLayers;

// Create the underlying image view object
m_view = pDevice->GetDXVKDevice()->createImageView(texture->GetImage(), viewInfo);
m_view = texture->GetImage()->createView(viewInfo);
}


Expand Down
2 changes: 1 addition & 1 deletion src/d3d11/d3d11_view_srv.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -176,7 +176,7 @@ namespace dxvk {
m_info.Image.NumLayers = viewInfo.numLayers;

// Create the underlying image view object
m_imageView = pDevice->GetDXVKDevice()->createImageView(texture->GetImage(), viewInfo);
m_imageView = texture->GetImage()->createView(viewInfo);
}
}

Expand Down
3 changes: 1 addition & 2 deletions src/d3d11/d3d11_view_uav.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -121,8 +121,7 @@ namespace dxvk {
m_info.Image.NumLevels = viewInfo.numLevels;
m_info.Image.NumLayers = viewInfo.numLayers;

m_imageView = pDevice->GetDXVKDevice()->createImageView(
GetCommonTexture(pResource)->GetImage(), viewInfo);
m_imageView = GetCommonTexture(pResource)->GetImage()->createView(viewInfo);
}
}

Expand Down
2 changes: 1 addition & 1 deletion src/d3d9/d3d9_common_texture.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -663,7 +663,7 @@ namespace dxvk {
VK_COMPONENT_SWIZZLE_IDENTITY, VK_COMPONENT_SWIZZLE_IDENTITY };

// Create the underlying image view object
return m_device->GetDXVKDevice()->createImageView(GetImage(), viewInfo);
return GetImage()->createView(viewInfo);
}


Expand Down
2 changes: 1 addition & 1 deletion src/d3d9/d3d9_format_helpers.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -85,7 +85,7 @@ namespace dxvk {
imageViewInfo.numLevels = 1;
imageViewInfo.minLayer = dstSubresource.baseArrayLayer;
imageViewInfo.numLayers = dstSubresource.layerCount;
auto tmpImageView = m_device->createImageView(dstImage, imageViewInfo);
auto tmpImageView = dstImage->createView(imageViewInfo);

VkExtent3D imageExtent = dstImage->mipLevelExtent(dstSubresource.mipLevel);
imageExtent = VkExtent3D{ imageExtent.width / macroPixelRun.width,
Expand Down
2 changes: 1 addition & 1 deletion src/dxvk/dxvk_context.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -3919,7 +3919,7 @@ namespace dxvk {
if (dstImage->mipLevelExtent(dstSubresource.mipLevel) != dstExtent)
return false;

auto view = m_device->createImageView(dstImage, viewInfo);
auto view = dstImage->createView(viewInfo);
this->deferClear(view, srcSubresource.aspectMask, clear->clearValue);
return true;
}
Expand Down
7 changes: 0 additions & 7 deletions src/dxvk/dxvk_device.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -171,13 +171,6 @@ namespace dxvk {
}


Rc<DxvkImageView> DxvkDevice::createImageView(
const Rc<DxvkImage>& image,
const DxvkImageViewCreateInfo& createInfo) {
return image->createView(createInfo);
}


Rc<DxvkSampler> DxvkDevice::createSampler(
const DxvkSamplerCreateInfo& createInfo) {
return new DxvkSampler(this, createInfo);
Expand Down
11 changes: 0 additions & 11 deletions src/dxvk/dxvk_device.h
Original file line number Diff line number Diff line change
Expand Up @@ -322,17 +322,6 @@ namespace dxvk {
Rc<DxvkImage> createImage(
const DxvkImageCreateInfo& createInfo,
VkMemoryPropertyFlags memoryType);

/**
* \brief Creates an image view
*
* \param [in] image The image to create a view for
* \param [in] createInfo Image view create info
* \returns The image view
*/
Rc<DxvkImageView> createImageView(
const Rc<DxvkImage>& image,
const DxvkImageViewCreateInfo& createInfo);

/**
* \brief Creates a sampler object
Expand Down
4 changes: 2 additions & 2 deletions src/dxvk/dxvk_swapchain_blitter.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -267,7 +267,7 @@ namespace dxvk {
viewInfo.minLayer = 0;
viewInfo.numLayers = 1;

m_gammaView = m_device->createImageView(m_gammaImage, viewInfo);
m_gammaView = m_gammaImage->createView(viewInfo);
}

ctx->invalidateBuffer(m_gammaBuffer, std::move(m_gammaSlice));
Expand Down Expand Up @@ -380,7 +380,7 @@ namespace dxvk {
viewInfo.numLevels = 1;
viewInfo.minLayer = 0;
viewInfo.numLayers = 1;
m_resolveView = m_device->createImageView(m_resolveImage, viewInfo);
m_resolveView = m_resolveImage->createView(viewInfo);
}


Expand Down
2 changes: 1 addition & 1 deletion src/dxvk/hud/dxvk_hud_renderer.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -316,7 +316,7 @@ namespace dxvk::hud {
info.minLayer = 0;
info.numLayers = 1;

return m_device->createImageView(m_fontImage, info);
return m_fontImage->createView(info);
}


Expand Down

0 comments on commit 01a7457

Please sign in to comment.