quick/Quake-III-Arena-VS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

DX12: mipmaps.

Browse Source
This commit is contained in:
Artem Kharytoniuk 2017-12-09 21:32:20 +01:00
parent ed86e89da2
commit 69fc682c95
4 changed files with 32 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
src/engine/renderer/dx.cpp
View File

@ -404,7 +404,7 @@ Dx_Image dx_create_image(int width, int height, DXGI_FORMAT format, int mip_leve
desc.Width = width; desc.Width = width;
desc.Height = height; desc.Height = height;
desc.DepthOrArraySize = 1; desc.DepthOrArraySize = 1;
desc.MipLevels = 1; // /* mip_levels */; !!!!!!!!!!!!!!!!!!!!!! desc.MipLevels = mip_levels;
desc.Format = format; desc.Format = format;
desc.SampleDesc.Count = 1; desc.SampleDesc.Count = 1;
desc.SampleDesc.Quality = 0; desc.SampleDesc.Quality = 0;
@ -426,7 +426,7 @@ Dx_Image dx_create_image(int width, int height, DXGI_FORMAT format, int mip_leve
srv_desc.Format = format; srv_desc.Format = format;
srv_desc.ViewDimension = D3D12_SRV_DIMENSION_TEXTURE2D; srv_desc.ViewDimension = D3D12_SRV_DIMENSION_TEXTURE2D;
srv_desc.Shader4ComponentMapping = D3D12_DEFAULT_SHADER_4_COMPONENT_MAPPING; srv_desc.Shader4ComponentMapping = D3D12_DEFAULT_SHADER_4_COMPONENT_MAPPING;
srv_desc.Texture2D.MipLevels = 1; // !!!!!!!!!!!!!!!!!!!!!!1 srv_desc.Texture2D.MipLevels = mip_levels;
D3D12_CPU_DESCRIPTOR_HANDLE handle; D3D12_CPU_DESCRIPTOR_HANDLE handle;
handle.ptr = dx.srv_heap->GetCPUDescriptorHandleForHeapStart().ptr + image_index * dx.srv_descriptor_size; handle.ptr = dx.srv_heap->GetCPUDescriptorHandleForHeapStart().ptr + image_index * dx.srv_descriptor_size;
@ -438,8 +438,8 @@ Dx_Image dx_create_image(int width, int height, DXGI_FORMAT format, int mip_leve
return image; return image;
} }
void dx_upload_image_data(ID3D12Resource* texture, int width, int height, bool mipmap, const uint8_t* pixels, int bytes_per_pixel) { void dx_upload_image_data(ID3D12Resource* texture, int width, int height, int mip_levels, const uint8_t* pixels, int bytes_per_pixel) {
const UINT64 upload_buffer_size = GetRequiredIntermediateSize(texture, 0, 1); const UINT64 upload_buffer_size = GetRequiredIntermediateSize(texture, 0, mip_levels);
ComPtr<ID3D12Resource> upload_texture; ComPtr<ID3D12Resource> upload_texture;
DX_CHECK(dx.device->CreateCommittedResource( DX_CHECK(dx.device->CreateCommittedResource(
@ -450,17 +450,29 @@ void dx_upload_image_data(ID3D12Resource* texture, int width, int height, bool m
nullptr, nullptr,
IID_PPV_ARGS(&upload_texture))); IID_PPV_ARGS(&upload_texture)));
D3D12_SUBRESOURCE_DATA texture_data {}; D3D12_SUBRESOURCE_DATA texture_data[16];
texture_data.pData = pixels;
texture_data.RowPitch = width * bytes_per_pixel;
texture_data.SlicePitch = texture_data.RowPitch * height;
record_and_run_commands(dx.command_queue, [&texture, &upload_texture, &texture_data](ID3D12GraphicsCommandList* command_list) for (int i = 0; i < mip_levels; i++) {
texture_data[i].pData = pixels;
texture_data[i].RowPitch = width * bytes_per_pixel;
texture_data[i].SlicePitch = texture_data[i].RowPitch * height;
pixels += texture_data[i].SlicePitch;
width >>= 1;
if (width < 1) width = 1;
height >>= 1;
if (height < 1) height = 1;
}
record_and_run_commands(dx.command_queue, [&texture, &upload_texture, &texture_data, &mip_levels]
(ID3D12GraphicsCommandList* command_list)
{ {
command_list->ResourceBarrier(1, &CD3DX12_RESOURCE_BARRIER::Transition(texture, command_list->ResourceBarrier(1, &CD3DX12_RESOURCE_BARRIER::Transition(texture,
D3D12_RESOURCE_STATE_PIXEL_SHADER_RESOURCE, D3D12_RESOURCE_STATE_COPY_DEST)); D3D12_RESOURCE_STATE_PIXEL_SHADER_RESOURCE, D3D12_RESOURCE_STATE_COPY_DEST));
UpdateSubresources(command_list, texture, upload_texture.Get(), 0, 0, 1, &texture_data); UpdateSubresources(command_list, texture, upload_texture.Get(), 0, 0, mip_levels, texture_data);
command_list->ResourceBarrier(1, &CD3DX12_RESOURCE_BARRIER::Transition(texture, command_list->ResourceBarrier(1, &CD3DX12_RESOURCE_BARRIER::Transition(texture,
D3D12_RESOURCE_STATE_COPY_DEST, D3D12_RESOURCE_STATE_PIXEL_SHADER_RESOURCE)); D3D12_RESOURCE_STATE_COPY_DEST, D3D12_RESOURCE_STATE_PIXEL_SHADER_RESOURCE));
@ -477,10 +489,10 @@ static ID3D12PipelineState* create_pipeline(const Vk_Pipeline_Def& def) {
// Vertex elements. // Vertex elements.
D3D12_INPUT_ELEMENT_DESC input_element_desc[] = D3D12_INPUT_ELEMENT_DESC input_element_desc[] =
{ {
{ "POSITION", 0, DXGI_FORMAT_R32G32B32_FLOAT, 0, D3D12_APPEND_ALIGNED_ELEMENT, D3D12_INPUT_CLASSIFICATION_PER_VERTEX_DATA, 0 }, { "POSITION", 0, DXGI_FORMAT_R32G32B32_FLOAT, 0, 0, D3D12_INPUT_CLASSIFICATION_PER_VERTEX_DATA, 0 },
{ "COLOR", 0, DXGI_FORMAT_R8G8B8A8_UNORM, 1, D3D12_APPEND_ALIGNED_ELEMENT, D3D12_INPUT_CLASSIFICATION_PER_VERTEX_DATA, 0 }, { "COLOR", 0, DXGI_FORMAT_R8G8B8A8_UNORM, 1, 0, D3D12_INPUT_CLASSIFICATION_PER_VERTEX_DATA, 0 },
{ "TEXCOORD", 0, DXGI_FORMAT_R32G32_FLOAT, 2, D3D12_APPEND_ALIGNED_ELEMENT, D3D12_INPUT_CLASSIFICATION_PER_VERTEX_DATA, 0 }, { "TEXCOORD", 0, DXGI_FORMAT_R32G32_FLOAT, 2, 0, D3D12_INPUT_CLASSIFICATION_PER_VERTEX_DATA, 0 },
{ "TEXCOORD", 1, DXGI_FORMAT_R32G32_FLOAT, 3, D3D12_APPEND_ALIGNED_ELEMENT, D3D12_INPUT_CLASSIFICATION_PER_VERTEX_DATA, 0 } { "TEXCOORD", 1, DXGI_FORMAT_R32G32_FLOAT, 3, 0, D3D12_INPUT_CLASSIFICATION_PER_VERTEX_DATA, 0 }
}; };
// //

2
src/engine/renderer/dx.h
View File

@ -36,7 +36,7 @@ void dx_release_resources();
// Resources allocation. // Resources allocation.
// //
Dx_Image dx_create_image(int width, int height, DXGI_FORMAT format, int mip_levels, bool repeat_texture, int image_index); Dx_Image dx_create_image(int width, int height, DXGI_FORMAT format, int mip_levels, bool repeat_texture, int image_index);
void dx_upload_image_data(ID3D12Resource* texture, int width, int height, bool mipmap, const uint8_t* pixels, int bytes_per_pixel); void dx_upload_image_data(ID3D12Resource* texture, int width, int height, int mip_levels, const uint8_t* pixels, int bytes_per_pixel);
ID3D12PipelineState* dx_find_pipeline(const Vk_Pipeline_Def& def); ID3D12PipelineState* dx_find_pipeline(const Vk_Pipeline_Def& def);
// //

6
src/engine/renderer/tr_backend.c
View File

@ -729,7 +729,7 @@ void RE_UploadCinematic (int w, int h, int cols, int rows, const byte *data, int
Dx_Image& image = dx_world.images[image_index]; Dx_Image& image = dx_world.images[image_index];
image.texture->Release(); image.texture->Release();
image = dx_create_image(cols, rows, DXGI_FORMAT_R8G8B8A8_UNORM, 1, false, image_index); image = dx_create_image(cols, rows, DXGI_FORMAT_R8G8B8A8_UNORM, 1, false, image_index);
dx_upload_image_data(image.texture, cols, rows, false, data, 4); dx_upload_image_data(image.texture, cols, rows, 1, data, 4);
} }
} else { } else {
if (dirty) { if (dirty) {
@ -740,12 +740,12 @@ void RE_UploadCinematic (int w, int h, int cols, int rows, const byte *data, int
// VULKAN // VULKAN
if (vk.active) { if (vk.active) {
const Vk_Image& image = vk_world.images[tr.scratchImage[client]->index]; const Vk_Image& image = vk_world.images[tr.scratchImage[client]->index];
vk_upload_image_data(image.handle, cols, rows, false, data, 4); vk_upload_image_data(image.handle, cols, rows, 1, data, 4);
} }
// D3D // D3D
if (dx.active) { if (dx.active) {
const Dx_Image& image = dx_world.images[tr.scratchImage[client]->index]; const Dx_Image& image = dx_world.images[tr.scratchImage[client]->index];
dx_upload_image_data(image.texture, cols, rows, false, data, 4); dx_upload_image_data(image.texture, cols, rows, 1, data, 4);
} }
} }
} }

4
src/engine/renderer/tr_image.c
View File

@ -686,7 +686,7 @@ static int upload_gl_image(const Image_Upload_Data& upload_data, int texture_add
return internal_format; return internal_format;
} }
// D3D // DX12
static Dx_Image upload_dx_image(const Image_Upload_Data& upload_data, bool repeat_texture, int image_index) { static Dx_Image upload_dx_image(const Image_Upload_Data& upload_data, bool repeat_texture, int image_index) {
int w = upload_data.base_level_width; int w = upload_data.base_level_width;
int h = upload_data.base_level_height; int h = upload_data.base_level_height;
@ -736,7 +736,7 @@ static Dx_Image upload_dx_image(const Image_Upload_Data& upload_data, bool repea
} }
Dx_Image image = dx_create_image(w, h, format, upload_data.mip_levels, repeat_texture, image_index); Dx_Image image = dx_create_image(w, h, format, upload_data.mip_levels, repeat_texture, image_index);
dx_upload_image_data(image.texture, w, h, upload_data.mip_levels > 1, upload_data.buffer, bytes_per_pixel); dx_upload_image_data(image.texture, w, h, upload_data.mip_levels, upload_data.buffer, bytes_per_pixel);
return image; return image;
} }