qf/quakeforge
0
0
Fork 0
mirror of https://git.code.sf.net/p/quake/quakeforge synced 2024-12-21 01:50:53 +00:00
Code Issues Projects Releases Packages Wiki Activity
quakeforge/libs/video/renderer/vulkan/vulkan_texture.c

558 lines
15 KiB
C
Raw Normal View History

[vulkan] Implement basic quake texture loading It optionally generates mipmaps, and supports the main texture types (especially for texture packs), including palettes, but is otherwise rather unsophisticated code. Needs a lot of work, but testing first.
2021-01-17 17:10:56 +00:00
/*
vulkan_texuture.c
Quake specific Vulkan texuture manager
Copyright (C) 2021 Bill Currie <bill@taniwha.org>
This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public License
as published by the Free Software Foundation; either version 2
of the License, or (at your option) any later version.
This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
See the GNU General Public License for more details.
You should have received a copy of the GNU General Public License
along with this program; if not, write to:
Free Software Foundation, Inc.
59 Temple Place - Suite 330
Boston, MA 02111-1307, USA
*/
#ifdef HAVE_CONFIG_H
# include "config.h"
#endif
#ifdef HAVE_MATH_H
# include <math.h>
#endif
#ifdef HAVE_STRING_H
# include <string.h>
#endif
#ifdef HAVE_STRINGS_H
# include <strings.h>
#endif
[vulkan] Name most resources This makes debugging with renderdoc and validation messages much easier (no more "what buffer is that?").
2021-01-31 10:58:55 +00:00
#include "QF/va.h"
[vulkan] Implement basic quake texture loading It optionally generates mipmaps, and supports the main texture types (especially for texture packs), including palettes, but is otherwise rather unsophisticated code. Needs a lot of work, but testing first.
2021-01-17 17:10:56 +00:00
#include "QF/Vulkan/qf_texture.h"
#include "QF/Vulkan/barrier.h"
[vulkan] Name most resources This makes debugging with renderdoc and validation messages much easier (no more "what buffer is that?").
2021-01-31 10:58:55 +00:00
#include "QF/Vulkan/debug.h"
[vulkan] Abandon bindless rendering At least for now, it is more trouble than it is worth as it (or my implementation of it) breaks lavapipe and renderdoc.
2021-12-17 03:20:32 +00:00
#include "QF/Vulkan/descriptor.h"
[vulkan] Implement basic quake texture loading It optionally generates mipmaps, and supports the main texture types (especially for texture packs), including palettes, but is otherwise rather unsophisticated code. Needs a lot of work, but testing first.
2021-01-17 17:10:56 +00:00
#include "QF/Vulkan/device.h"
#include "QF/Vulkan/image.h"
#include "QF/Vulkan/instance.h"
#include "QF/Vulkan/staging.h"
#include "vid_vulkan.h"
[vulkan] Upload brush model textures Things aren't quite right with them (sky texture is very wrong), but the heavy lifting is done.
2021-01-20 15:40:22 +00:00
void
Vulkan_ExpandPalette (byte *dst, const byte *src, const byte *palette,
int alpha, int count)
{
[vulkan] Get sky sheets working The sky texture is loaded with black's alpha set to 0. While this does hit both layers, the screen is cleared to black so it shouldn't be a problem (and will allow having a skybox behind the sheets).
2021-01-23 14:58:34 +00:00
if (alpha > 1) {
while (count-- > 0) {
int pix = *src++;
const byte *col = palette + pix * 4;
*dst++ = *col++;
*dst++ = *col++;
*dst++ = *col++;
*dst++ = *col++;
}
} else if (alpha) {
[vulkan] Upload brush model textures Things aren't quite right with them (sky texture is very wrong), but the heavy lifting is done.
2021-01-20 15:40:22 +00:00
while (count-- > 0) {
byte pix = *src++;
[vulkan] Fix a pile of data upload issues Copying data from the wrong buffer was the cause of the corrupted brush model vertices, and then lots of little errors (mostly forgetting to multiply by bpp) for textures.
2021-01-21 12:24:54 +00:00
const byte *col = palette + pix * 3;
[vulkan] Upload brush model textures Things aren't quite right with them (sky texture is very wrong), but the heavy lifting is done.
2021-01-20 15:40:22 +00:00
*dst++ = *col++;
*dst++ = *col++;
*dst++ = *col++;
*dst++ = 0xff;
}
} else {
while (count-- > 0) {
byte pix = *src++;
[vulkan] Fix a pile of data upload issues Copying data from the wrong buffer was the cause of the corrupted brush model vertices, and then lots of little errors (mostly forgetting to multiply by bpp) for textures.
2021-01-21 12:24:54 +00:00
const byte *col = palette + pix * 3;
[vulkan] Upload brush model textures Things aren't quite right with them (sky texture is very wrong), but the heavy lifting is done.
2021-01-20 15:40:22 +00:00
*dst++ = *col++;
*dst++ = *col++;
*dst++ = *col++;
}
}
}
[vulkan] Implement sky box loading and rendering Loading is broken for multi-file image sets due to the way images are loaded (this needs some thought for making it effecient), but the Blender environment map loading works.
2021-03-25 06:54:34 +00:00
static int
tex_format (const tex_t *tex, VkFormat *format, int *bpp)
[vulkan] Implement basic quake texture loading It optionally generates mipmaps, and supports the main texture types (especially for texture packs), including palettes, but is otherwise rather unsophisticated code. Needs a lot of work, but testing first.
2021-01-17 17:10:56 +00:00
{
switch (tex->format) {
case tex_l:
case tex_a:
[vulkan] Implement sky box loading and rendering Loading is broken for multi-file image sets due to the way images are loaded (this needs some thought for making it effecient), but the Blender environment map loading works.
2021-03-25 06:54:34 +00:00
*format = VK_FORMAT_R8_UNORM;
*bpp = 1;
return 1;
[vulkan] Implement basic quake texture loading It optionally generates mipmaps, and supports the main texture types (especially for texture packs), including palettes, but is otherwise rather unsophisticated code. Needs a lot of work, but testing first.
2021-01-17 17:10:56 +00:00
case tex_la:
[vulkan] Implement sky box loading and rendering Loading is broken for multi-file image sets due to the way images are loaded (this needs some thought for making it effecient), but the Blender environment map loading works.
2021-03-25 06:54:34 +00:00
*format = VK_FORMAT_R8G8_UNORM;
*bpp = 2;
return 1;
[vulkan] Implement basic quake texture loading It optionally generates mipmaps, and supports the main texture types (especially for texture packs), including palettes, but is otherwise rather unsophisticated code. Needs a lot of work, but testing first.
2021-01-17 17:10:56 +00:00
case tex_palette:
if (!tex->palette) {
return 0;
}
[vulkan] Implement sky box loading and rendering Loading is broken for multi-file image sets due to the way images are loaded (this needs some thought for making it effecient), but the Blender environment map loading works.
2021-03-25 06:54:34 +00:00
*format = VK_FORMAT_R8G8B8A8_UNORM;
*bpp = 4;
return 1;
[vulkan] Implement basic quake texture loading It optionally generates mipmaps, and supports the main texture types (especially for texture packs), including palettes, but is otherwise rather unsophisticated code. Needs a lot of work, but testing first.
2021-01-17 17:10:56 +00:00
case tex_rgb:
[vulkan] Implement sky box loading and rendering Loading is broken for multi-file image sets due to the way images are loaded (this needs some thought for making it effecient), but the Blender environment map loading works.
2021-03-25 06:54:34 +00:00
*format = VK_FORMAT_R8G8B8A8_UNORM;
*bpp = 4;
return 1;
[vulkan] Implement basic quake texture loading It optionally generates mipmaps, and supports the main texture types (especially for texture packs), including palettes, but is otherwise rather unsophisticated code. Needs a lot of work, but testing first.
2021-01-17 17:10:56 +00:00
case tex_rgba:
[vulkan] Implement sky box loading and rendering Loading is broken for multi-file image sets due to the way images are loaded (this needs some thought for making it effecient), but the Blender environment map loading works.
2021-03-25 06:54:34 +00:00
*format = VK_FORMAT_R8G8B8A8_UNORM;
*bpp = 4;
return 1;
[image] Add support for float rgba for vulkan
2021-01-19 16:18:47 +00:00
case tex_frgba:
[vulkan] Implement sky box loading and rendering Loading is broken for multi-file image sets due to the way images are loaded (this needs some thought for making it effecient), but the Blender environment map loading works.
2021-03-25 06:54:34 +00:00
*format = VK_FORMAT_R32G32B32A32_SFLOAT;
*bpp = 16;
return 1;
}
return 0;
}
static size_t
stage_tex_data (qfv_packet_t *packet, tex_t *tex, int bpp)
{
size_t texels = tex->width * tex->height;
byte *tex_data = QFV_PacketExtend (packet, bpp * texels);
if (tex->format == tex_palette) {
Vulkan_ExpandPalette (tex_data, tex->data, tex->palette, 1, texels);
} else {
if (tex->format == 3) {
byte *in = tex->data;
byte *out = tex_data;
while (texels-- > 0) {
*out++ = *in++;
*out++ = *in++;
*out++ = *in++;
*out++ = 255;
}
} else {
memcpy (tex_data, tex->data, bpp * texels);
}
[vulkan] Implement basic quake texture loading It optionally generates mipmaps, and supports the main texture types (especially for texture packs), including palettes, but is otherwise rather unsophisticated code. Needs a lot of work, but testing first.
2021-01-17 17:10:56 +00:00
}
[vulkan] Implement sky box loading and rendering Loading is broken for multi-file image sets due to the way images are loaded (this needs some thought for making it effecient), but the Blender environment map loading works.
2021-03-25 06:54:34 +00:00
return tex_data - (byte *) packet->stage->data;
}
qfv_tex_t *
[vulkan] Add a function to load texture arrays I needed to create an array texture and didn't feel like doing all that boilerplate again :P.
2022-05-26 09:43:15 +00:00
Vulkan_LoadTexArray (vulkan_ctx_t *ctx, tex_t *tex, int layers, int mip,
const char *name)
[vulkan] Implement sky box loading and rendering Loading is broken for multi-file image sets due to the way images are loaded (this needs some thought for making it effecient), but the Blender environment map loading works.
2021-03-25 06:54:34 +00:00
{
qfv_device_t *device = ctx->device;
qfv_devfuncs_t *dfunc = device->funcs;
int bpp;
VkFormat format;
if (!tex_format (tex, &format, &bpp)) {
[vulkan] Implement basic quake texture loading It optionally generates mipmaps, and supports the main texture types (especially for texture packs), including palettes, but is otherwise rather unsophisticated code. Needs a lot of work, but testing first.
2021-01-17 17:10:56 +00:00
return 0;
}
[vulkan] Add a function to load texture arrays I needed to create an array texture and didn't feel like doing all that boilerplate again :P.
2022-05-26 09:43:15 +00:00
for (int i = 1; i < layers; i++) {
if (tex[i].width != tex[0].width || tex[i].height != tex[0].height
|| tex[i].format != tex[0].format) {
return 0;
}
}
[vulkan] Implement basic quake texture loading It optionally generates mipmaps, and supports the main texture types (especially for texture packs), including palettes, but is otherwise rather unsophisticated code. Needs a lot of work, but testing first.
2021-01-17 17:10:56 +00:00
if (mip) {
[vulkan] Add a function to load texture arrays I needed to create an array texture and didn't feel like doing all that boilerplate again :P.
2022-05-26 09:43:15 +00:00
mip = QFV_MipLevels (tex[0].width, tex[0].height);
[vulkan] Implement basic quake texture loading It optionally generates mipmaps, and supports the main texture types (especially for texture packs), including palettes, but is otherwise rather unsophisticated code. Needs a lot of work, but testing first.
2021-01-17 17:10:56 +00:00
} else {
mip = 1;
}
//qfv_devfuncs_t *dfunc = device->funcs;
//FIXME this whole thing is ineffiecient, especially for small textures
qfv_tex_t *qtex = malloc (sizeof (qfv_tex_t));
[vulkan] Add a function to load texture arrays I needed to create an array texture and didn't feel like doing all that boilerplate again :P.
2022-05-26 09:43:15 +00:00
VkExtent3D extent = { tex[0].width, tex[0].height, 1 };
VkImageType itype = layers > 0 ? VK_IMAGE_TYPE_2D : VK_IMAGE_TYPE_2D;
Fix a bunch of issues for clang One *actual* error (wrong enum type), and some memory alignment issues. The rest just clang being lame.
2022-07-26 12:36:56 +00:00
VkImageViewType vtype = layers > 0 ? VK_IMAGE_VIEW_TYPE_2D_ARRAY
: VK_IMAGE_VIEW_TYPE_2D;
[vulkan] Add a function to load texture arrays I needed to create an array texture and didn't feel like doing all that boilerplate again :P.
2022-05-26 09:43:15 +00:00
if (layers < 1) {
layers = 1;
}
qtex->image = QFV_CreateImage (device, 0, itype, format, extent,
mip, layers, VK_SAMPLE_COUNT_1_BIT,
[vulkan] Implement basic quake texture loading It optionally generates mipmaps, and supports the main texture types (especially for texture packs), including palettes, but is otherwise rather unsophisticated code. Needs a lot of work, but testing first.
2021-01-17 17:10:56 +00:00
VK_IMAGE_USAGE_TRANSFER_DST_BIT
[vulkan] Get Vulkan_LoadTex working Finally managed to actually use and thus sort out its issues.
2021-01-26 01:22:06 +00:00
| VK_IMAGE_USAGE_TRANSFER_SRC_BIT
[vulkan] Implement basic quake texture loading It optionally generates mipmaps, and supports the main texture types (especially for texture packs), including palettes, but is otherwise rather unsophisticated code. Needs a lot of work, but testing first.
2021-01-17 17:10:56 +00:00
| VK_IMAGE_USAGE_SAMPLED_BIT);
[vulkan] Name most resources This makes debugging with renderdoc and validation messages much easier (no more "what buffer is that?").
2021-01-31 10:58:55 +00:00
QFV_duSetObjectName (device, VK_OBJECT_TYPE_IMAGE, qtex->image,
va (ctx->va_ctx, "image:%s", name));
[vulkan] Implement basic quake texture loading It optionally generates mipmaps, and supports the main texture types (especially for texture packs), including palettes, but is otherwise rather unsophisticated code. Needs a lot of work, but testing first.
2021-01-17 17:10:56 +00:00
qtex->memory = QFV_AllocImageMemory (device, qtex->image,
VK_MEMORY_PROPERTY_DEVICE_LOCAL_BIT,
0, 0);
[vulkan] Name most resources This makes debugging with renderdoc and validation messages much easier (no more "what buffer is that?").
2021-01-31 10:58:55 +00:00
QFV_duSetObjectName (device, VK_OBJECT_TYPE_DEVICE_MEMORY, qtex->memory,
va (ctx->va_ctx, "memory:%s", name));
[vulkan] Implement basic quake texture loading It optionally generates mipmaps, and supports the main texture types (especially for texture packs), including palettes, but is otherwise rather unsophisticated code. Needs a lot of work, but testing first.
2021-01-17 17:10:56 +00:00
QFV_BindImageMemory (device, qtex->image, qtex->memory, 0);
[vulkan] Add a function to load texture arrays I needed to create an array texture and didn't feel like doing all that boilerplate again :P.
2022-05-26 09:43:15 +00:00
qtex->view = QFV_CreateImageView (device, qtex->image, vtype,
[vulkan] Create some default textures Black, white and magenta. This gets glow (full bright) maps working.
2021-01-23 06:40:31 +00:00
VK_FORMAT_R8G8B8A8_UNORM,
VK_IMAGE_ASPECT_COLOR_BIT);
[vulkan] Name most resources This makes debugging with renderdoc and validation messages much easier (no more "what buffer is that?").
2021-01-31 10:58:55 +00:00
QFV_duSetObjectName (device, VK_OBJECT_TYPE_IMAGE_VIEW, qtex->view,
va (ctx->va_ctx, "iview:%s", name));
[vulkan] Implement basic quake texture loading It optionally generates mipmaps, and supports the main texture types (especially for texture packs), including palettes, but is otherwise rather unsophisticated code. Needs a lot of work, but testing first.
2021-01-17 17:10:56 +00:00
qfv_packet_t *packet = QFV_PacketAcquire (ctx->staging);
[vulkan] Add a function to load texture arrays I needed to create an array texture and didn't feel like doing all that boilerplate again :P.
2022-05-26 09:43:15 +00:00
VkBufferImageCopy copy[layers];
copy[0] = (VkBufferImageCopy) {
0, 0, 0,
{VK_IMAGE_ASPECT_COLOR_BIT, 0, 0, 1},
{0, 0, 0}, {tex[0].width, tex[0].height, 1},
};
for (int i = 0; i < layers; i++) {
copy[i] = copy[0];
copy[i].bufferOffset = stage_tex_data (packet, &tex[i], bpp);
copy[i].imageSubresource.baseArrayLayer = i;
}
[vulkan] Implement basic quake texture loading It optionally generates mipmaps, and supports the main texture types (especially for texture packs), including palettes, but is otherwise rather unsophisticated code. Needs a lot of work, but testing first.
2021-01-17 17:10:56 +00:00
[vulkan] Clean up image barriers a bit Mostly, this gets the stage flags in with the barrier, but also adds a couple more barrier templates. It should make for slightly less verbose code, and one less opportunity for error (mismatched barrier/stages).
2021-04-24 03:42:29 +00:00
qfv_imagebarrier_t ib = imageBarriers[qfv_LT_Undefined_to_TransferDst];
ib.barrier.image = qtex->image;
ib.barrier.subresourceRange.levelCount = VK_REMAINING_MIP_LEVELS;
[vulkan] Add a function to load texture arrays I needed to create an array texture and didn't feel like doing all that boilerplate again :P.
2022-05-26 09:43:15 +00:00
ib.barrier.subresourceRange.layerCount = VK_REMAINING_ARRAY_LAYERS;
[vulkan] Clean up image barriers a bit Mostly, this gets the stage flags in with the barrier, but also adds a couple more barrier templates. It should make for slightly less verbose code, and one less opportunity for error (mismatched barrier/stages).
2021-04-24 03:42:29 +00:00
dfunc->vkCmdPipelineBarrier (packet->cmd, ib.srcStages, ib.dstStages,
[vulkan] Implement basic quake texture loading It optionally generates mipmaps, and supports the main texture types (especially for texture packs), including palettes, but is otherwise rather unsophisticated code. Needs a lot of work, but testing first.
2021-01-17 17:10:56 +00:00
0, 0, 0, 0, 0,
[vulkan] Clean up image barriers a bit Mostly, this gets the stage flags in with the barrier, but also adds a couple more barrier templates. It should make for slightly less verbose code, and one less opportunity for error (mismatched barrier/stages).
2021-04-24 03:42:29 +00:00
1, &ib.barrier);
[vulkan] Implement basic quake texture loading It optionally generates mipmaps, and supports the main texture types (especially for texture packs), including palettes, but is otherwise rather unsophisticated code. Needs a lot of work, but testing first.
2021-01-17 17:10:56 +00:00
dfunc->vkCmdCopyBufferToImage (packet->cmd, packet->stage->buffer,
qtex->image,
VK_IMAGE_LAYOUT_TRANSFER_DST_OPTIMAL,
[vulkan] Add a function to load texture arrays I needed to create an array texture and didn't feel like doing all that boilerplate again :P.
2022-05-26 09:43:15 +00:00
layers, copy);
[vulkan] Get Vulkan_LoadTex working Finally managed to actually use and thus sort out its issues.
2021-01-26 01:22:06 +00:00
if (mip == 1) {
[vulkan] Clean up image barriers a bit Mostly, this gets the stage flags in with the barrier, but also adds a couple more barrier templates. It should make for slightly less verbose code, and one less opportunity for error (mismatched barrier/stages).
2021-04-24 03:42:29 +00:00
ib = imageBarriers[qfv_LT_TransferDst_to_ShaderReadOnly];
ib.barrier.image = qtex->image;
dfunc->vkCmdPipelineBarrier (packet->cmd, ib.srcStages, ib.dstStages,
[vulkan] Get Vulkan_LoadTex working Finally managed to actually use and thus sort out its issues.
2021-01-26 01:22:06 +00:00
0, 0, 0, 0, 0,
[vulkan] Clean up image barriers a bit Mostly, this gets the stage flags in with the barrier, but also adds a couple more barrier templates. It should make for slightly less verbose code, and one less opportunity for error (mismatched barrier/stages).
2021-04-24 03:42:29 +00:00
1, &ib.barrier);
[vulkan] Get alias texture loading working That was a mess, partly premature optimizations, and some silly mistakes.
2021-01-27 03:15:45 +00:00
} else {
[vulkan] Make the mip map generation public I've decided that alias model skins should be in a single four-level array texture rather than spread over four textures, but there's no way I want to write that code again: getting it right was hard enough the first time :P
2021-02-01 03:16:05 +00:00
QFV_GenerateMipMaps (device, packet->cmd, qtex->image,
[vulkan] Add a function to load texture arrays I needed to create an array texture and didn't feel like doing all that boilerplate again :P.
2022-05-26 09:43:15 +00:00
mip, tex->width, tex->height, layers);
[vulkan] Implement basic quake texture loading It optionally generates mipmaps, and supports the main texture types (especially for texture packs), including palettes, but is otherwise rather unsophisticated code. Needs a lot of work, but testing first.
2021-01-17 17:10:56 +00:00
}
QFV_PacketSubmit (packet);
[vulkan] Create some default textures Black, white and magenta. This gets glow (full bright) maps working.
2021-01-23 06:40:31 +00:00
return qtex;
[vulkan] Implement basic quake texture loading It optionally generates mipmaps, and supports the main texture types (especially for texture packs), including palettes, but is otherwise rather unsophisticated code. Needs a lot of work, but testing first.
2021-01-17 17:10:56 +00:00
}
[vulkan] Add a function to load texture arrays I needed to create an array texture and didn't feel like doing all that boilerplate again :P.
2022-05-26 09:43:15 +00:00
qfv_tex_t *
Vulkan_LoadTex (vulkan_ctx_t *ctx, tex_t *tex, int mip, const char *name)
{
return Vulkan_LoadTexArray (ctx, tex, 0, mip, name);
}
[vulkan] Implement sky box loading and rendering Loading is broken for multi-file image sets due to the way images are loaded (this needs some thought for making it effecient), but the Blender environment map loading works.
2021-03-25 06:54:34 +00:00
static qfv_tex_t *
create_cubetex (vulkan_ctx_t *ctx, int size, VkFormat format,
const char *name)
{
qfv_device_t *device = ctx->device;
qfv_tex_t *qtex = malloc (sizeof (qfv_tex_t));
VkExtent3D extent = { size, size, 1 };
qtex->image = QFV_CreateImage (device, 1, VK_IMAGE_TYPE_2D, format, extent,
1, 1, VK_SAMPLE_COUNT_1_BIT,
VK_IMAGE_USAGE_SAMPLED_BIT
| VK_IMAGE_USAGE_TRANSFER_DST_BIT);
QFV_duSetObjectName (device, VK_OBJECT_TYPE_IMAGE, qtex->image,
va (ctx->va_ctx, "image:envmap:%s", name));
qtex->memory = QFV_AllocImageMemory (device, qtex->image,
VK_MEMORY_PROPERTY_DEVICE_LOCAL_BIT,
0, 0);
QFV_duSetObjectName (device, VK_OBJECT_TYPE_DEVICE_MEMORY, qtex->memory,
va (ctx->va_ctx, "memory:%s", name));
QFV_BindImageMemory (device, qtex->image, qtex->memory, 0);
qtex->view = QFV_CreateImageView (device, qtex->image,
VK_IMAGE_VIEW_TYPE_CUBE, format,
VK_IMAGE_ASPECT_COLOR_BIT);
QFV_duSetObjectName (device, VK_OBJECT_TYPE_IMAGE_VIEW, qtex->view,
va (ctx->va_ctx, "iview:envmap:%s", name));
return qtex;
}
qfv_tex_t *
Vulkan_LoadEnvMap (vulkan_ctx_t *ctx, tex_t *tex, const char *name)
{
qfv_device_t *device = ctx->device;
qfv_devfuncs_t *dfunc = device->funcs;
int bpp;
VkFormat format;
static int env_coords[][2] = {
{2, 0}, // right
{0, 0}, // left
{1, 1}, // top
{0, 1}, // bottom
{2, 1}, // front
{1, 0}, // back
};
if (!tex_format (tex, &format, &bpp)) {
return 0;
}
if (tex->height * 3 != tex->width * 2) {
return 0;
}
int size = tex->height / 2;
qfv_tex_t *qtex = create_cubetex (ctx, size, format, name);
qfv_packet_t *packet = QFV_PacketAcquire (ctx->staging);
stage_tex_data (packet, tex, bpp);
[vulkan] Clean up image barriers a bit Mostly, this gets the stage flags in with the barrier, but also adds a couple more barrier templates. It should make for slightly less verbose code, and one less opportunity for error (mismatched barrier/stages).
2021-04-24 03:42:29 +00:00
qfv_imagebarrier_t ib = imageBarriers[qfv_LT_Undefined_to_TransferDst];
ib.barrier.image = qtex->image;
ib.barrier.subresourceRange.levelCount = VK_REMAINING_MIP_LEVELS;
ib.barrier.subresourceRange.layerCount = VK_REMAINING_ARRAY_LAYERS;
dfunc->vkCmdPipelineBarrier (packet->cmd, ib.srcStages, ib.dstStages,
[vulkan] Implement sky box loading and rendering Loading is broken for multi-file image sets due to the way images are loaded (this needs some thought for making it effecient), but the Blender environment map loading works.
2021-03-25 06:54:34 +00:00
0, 0, 0, 0, 0,
[vulkan] Clean up image barriers a bit Mostly, this gets the stage flags in with the barrier, but also adds a couple more barrier templates. It should make for slightly less verbose code, and one less opportunity for error (mismatched barrier/stages).
2021-04-24 03:42:29 +00:00
1, &ib.barrier);
[vulkan] Implement sky box loading and rendering Loading is broken for multi-file image sets due to the way images are loaded (this needs some thought for making it effecient), but the Blender environment map loading works.
2021-03-25 06:54:34 +00:00
VkBufferImageCopy copy[6] = {
{
0, tex->width, 0,
{VK_IMAGE_ASPECT_COLOR_BIT, 0, 0, 1},
{0, 0, 0}, {size, size, 1},
},
};
for (int i = 0; i < 6; i++) {
int x = env_coords[i][0] * size;
int y = env_coords[i][1] * size;
int offset = x + y * tex->width;
copy[i] = copy[0];
copy[i].bufferOffset = packet->offset + bpp * offset;
copy[i].imageSubresource.baseArrayLayer = i;
}
dfunc->vkCmdCopyBufferToImage (packet->cmd, packet->stage->buffer,
qtex->image,
VK_IMAGE_LAYOUT_TRANSFER_DST_OPTIMAL,
6, copy);
[vulkan] Clean up image barriers a bit Mostly, this gets the stage flags in with the barrier, but also adds a couple more barrier templates. It should make for slightly less verbose code, and one less opportunity for error (mismatched barrier/stages).
2021-04-24 03:42:29 +00:00
ib = imageBarriers[qfv_LT_TransferDst_to_ShaderReadOnly];
ib.barrier.image = qtex->image;
ib.barrier.subresourceRange.levelCount = VK_REMAINING_MIP_LEVELS;
ib.barrier.subresourceRange.layerCount = VK_REMAINING_ARRAY_LAYERS;
dfunc->vkCmdPipelineBarrier (packet->cmd, ib.srcStages, ib.dstStages,
[vulkan] Implement sky box loading and rendering Loading is broken for multi-file image sets due to the way images are loaded (this needs some thought for making it effecient), but the Blender environment map loading works.
2021-03-25 06:54:34 +00:00
0, 0, 0, 0, 0,
[vulkan] Clean up image barriers a bit Mostly, this gets the stage flags in with the barrier, but also adds a couple more barrier templates. It should make for slightly less verbose code, and one less opportunity for error (mismatched barrier/stages).
2021-04-24 03:42:29 +00:00
1, &ib.barrier);
[vulkan] Implement sky box loading and rendering Loading is broken for multi-file image sets due to the way images are loaded (this needs some thought for making it effecient), but the Blender environment map loading works.
2021-03-25 06:54:34 +00:00
QFV_PacketSubmit (packet);
return qtex;
}
qfv_tex_t *
Vulkan_LoadEnvSides (vulkan_ctx_t *ctx, tex_t **tex, const char *name)
{
qfv_device_t *device = ctx->device;
qfv_devfuncs_t *dfunc = device->funcs;
int bpp;
VkFormat format;
if (!tex_format (tex[0], &format, &bpp)) {
return 0;
}
if (tex[0]->height != tex[0]->width) {
return 0;
}
for (int i = 1; i < 6; i++) {
if (tex[i]->format != tex[0]->format
|| tex[i]->width != tex[0]->width
|| tex[i]->height != tex[0]->height) {
return 0;
}
}
int size = tex[0]->height;
qfv_tex_t *qtex = create_cubetex (ctx, size, format, name);
qfv_packet_t *packet = QFV_PacketAcquire (ctx->staging);
[vulkan] Clean up image barriers a bit Mostly, this gets the stage flags in with the barrier, but also adds a couple more barrier templates. It should make for slightly less verbose code, and one less opportunity for error (mismatched barrier/stages).
2021-04-24 03:42:29 +00:00
qfv_imagebarrier_t ib = imageBarriers[qfv_LT_Undefined_to_TransferDst];
ib.barrier.image = qtex->image;
ib.barrier.subresourceRange.levelCount = VK_REMAINING_MIP_LEVELS;
ib.barrier.subresourceRange.layerCount = VK_REMAINING_ARRAY_LAYERS;
dfunc->vkCmdPipelineBarrier (packet->cmd, ib.srcStages, ib.dstStages,
[vulkan] Implement sky box loading and rendering Loading is broken for multi-file image sets due to the way images are loaded (this needs some thought for making it effecient), but the Blender environment map loading works.
2021-03-25 06:54:34 +00:00
0, 0, 0, 0, 0,
[vulkan] Clean up image barriers a bit Mostly, this gets the stage flags in with the barrier, but also adds a couple more barrier templates. It should make for slightly less verbose code, and one less opportunity for error (mismatched barrier/stages).
2021-04-24 03:42:29 +00:00
1, &ib.barrier);
[vulkan] Implement sky box loading and rendering Loading is broken for multi-file image sets due to the way images are loaded (this needs some thought for making it effecient), but the Blender environment map loading works.
2021-03-25 06:54:34 +00:00
VkBufferImageCopy copy[6] = {
{
0, 0, 0,
{VK_IMAGE_ASPECT_COLOR_BIT, 0, 0, 1},
{0, 0, 0}, {size, size, 1},
},
};
for (int i = 0; i < 6; i++) {
copy[i] = copy[0];
copy[i].bufferOffset = stage_tex_data (packet, tex[i], bpp);
copy[i].imageSubresource.baseArrayLayer = i;
}
dfunc->vkCmdCopyBufferToImage (packet->cmd, packet->stage->buffer,
qtex->image,
VK_IMAGE_LAYOUT_TRANSFER_DST_OPTIMAL,
6, copy);
[vulkan] Clean up image barriers a bit Mostly, this gets the stage flags in with the barrier, but also adds a couple more barrier templates. It should make for slightly less verbose code, and one less opportunity for error (mismatched barrier/stages).
2021-04-24 03:42:29 +00:00
ib = imageBarriers[qfv_LT_TransferDst_to_ShaderReadOnly];
ib.barrier.image = qtex->image;
ib.barrier.subresourceRange.levelCount = VK_REMAINING_MIP_LEVELS;
ib.barrier.subresourceRange.layerCount = VK_REMAINING_ARRAY_LAYERS;
dfunc->vkCmdPipelineBarrier (packet->cmd, ib.srcStages, ib.dstStages,
[vulkan] Implement sky box loading and rendering Loading is broken for multi-file image sets due to the way images are loaded (this needs some thought for making it effecient), but the Blender environment map loading works.
2021-03-25 06:54:34 +00:00
0, 0, 0, 0, 0,
[vulkan] Clean up image barriers a bit Mostly, this gets the stage flags in with the barrier, but also adds a couple more barrier templates. It should make for slightly less verbose code, and one less opportunity for error (mismatched barrier/stages).
2021-04-24 03:42:29 +00:00
1, &ib.barrier);
[vulkan] Implement sky box loading and rendering Loading is broken for multi-file image sets due to the way images are loaded (this needs some thought for making it effecient), but the Blender environment map loading works.
2021-03-25 06:54:34 +00:00
QFV_PacketSubmit (packet);
return qtex;
}
[vulkan] Implement basic quake texture loading It optionally generates mipmaps, and supports the main texture types (especially for texture packs), including palettes, but is otherwise rather unsophisticated code. Needs a lot of work, but testing first.
2021-01-17 17:10:56 +00:00
VkImageView
Vulkan_TexImageView (qfv_tex_t *tex)
{
return tex->view;
}
void
Vulkan_UnloadTex (vulkan_ctx_t *ctx, qfv_tex_t *tex)
{
qfv_device_t *device = ctx->device;
qfv_devfuncs_t *dfunc = device->funcs;
[vulkan] Add an array view for default_magenta The validation layers get very picky about image view types (rightfully so, I imagine).
2021-12-08 12:08:37 +00:00
if (tex->view) {
dfunc->vkDestroyImageView (device->dev, tex->view, 0);
}
if (tex->image) {
dfunc->vkDestroyImage (device->dev, tex->image, 0);
}
if (tex->memory) {
dfunc->vkFreeMemory (device->dev, tex->memory, 0);
}
[vulkan] Implement basic quake texture loading It optionally generates mipmaps, and supports the main texture types (especially for texture packs), including palettes, but is otherwise rather unsophisticated code. Needs a lot of work, but testing first.
2021-01-17 17:10:56 +00:00
free (tex);
}
[vulkan] Create some default textures Black, white and magenta. This gets glow (full bright) maps working.
2021-01-23 06:40:31 +00:00
[image] Change tex_t data from array to pointer This makes tex_t more generally useable and probably more portable. The goal was to be able to use tex_t with data that is in a separate chunk of memory.
2021-01-24 15:54:41 +00:00
static byte black_data[] = {0, 0, 0, 0};
static byte white_data[] = {255, 255, 255, 255};
static byte magenta_data[] = {255, 0, 255, 255};
[image] Make WritePNG take settings from tex_t This means that a tex_t object is passed in instead of just raw bytes and width and height, but it means the texture can specify whether it's flipped or uses BGR instead of RGB. This fixes the upside down screenshots for vulkan.
2022-03-31 11:00:13 +00:00
static tex_t default_black_tex = {
.width = 1,
.height = 1,
.format = tex_rgba,
.loaded = 1,
.palette =0,
.data = black_data,
};
static tex_t default_white_tex = {
.width = 1,
.height = 1,
.format = tex_rgba,
.loaded = 1,
.palette =0,
.data = white_data,
};
static tex_t default_magenta_tex = {
.width = 1,
.height = 1,
.format = tex_rgba,
.loaded = 1,
.palette =0,
.data = magenta_data,
};
[vulkan] Create some default textures Black, white and magenta. This gets glow (full bright) maps working.
2021-01-23 06:40:31 +00:00
void
Vulkan_Texture_Init (vulkan_ctx_t *ctx)
{
[vulkan] Abandon bindless rendering At least for now, it is more trouble than it is worth as it (or my implementation of it) breaks lavapipe and renderdoc.
2021-12-17 03:20:32 +00:00
qfvPushDebug (ctx, "texture init");
texturectx_t *tctx = calloc (1, sizeof (texturectx_t));
ctx->texture_context = tctx;
tctx->pool = Vulkan_CreateDescriptorPool (ctx, "texture_pool");
tctx->setLayout = Vulkan_CreateDescriptorSetLayout (ctx, "texture_set");
[vulkan] Name most resources This makes debugging with renderdoc and validation messages much easier (no more "what buffer is that?").
2021-01-31 10:58:55 +00:00
ctx->default_black = Vulkan_LoadTex (ctx, &default_black_tex, 1,
"default_black");
ctx->default_white = Vulkan_LoadTex (ctx, &default_white_tex, 1,
"default_white");
ctx->default_magenta = Vulkan_LoadTex (ctx, &default_magenta_tex, 1,
"default_magenta");
[vulkan] Add an array view for default_magenta The validation layers get very picky about image view types (rightfully so, I imagine).
2021-12-08 12:08:37 +00:00
qfv_tex_t *tex;
tex = ctx->default_magenta_array = malloc (sizeof (qfv_tex_t));
tex->memory = 0;
tex->image = 0;
tex->view = QFV_CreateImageView (ctx->device, ctx->default_magenta->image,
VK_IMAGE_VIEW_TYPE_2D_ARRAY,
VK_FORMAT_R8G8B8A8_UNORM,
VK_IMAGE_ASPECT_COLOR_BIT);
[vulkan] Abandon bindless rendering At least for now, it is more trouble than it is worth as it (or my implementation of it) breaks lavapipe and renderdoc.
2021-12-17 03:20:32 +00:00
qfvPopDebug (ctx);
[vulkan] Create some default textures Black, white and magenta. This gets glow (full bright) maps working.
2021-01-23 06:40:31 +00:00
}
void
Vulkan_Texture_Shutdown (vulkan_ctx_t *ctx)
{
Vulkan_UnloadTex (ctx, ctx->default_black);
Vulkan_UnloadTex (ctx, ctx->default_white);
Vulkan_UnloadTex (ctx, ctx->default_magenta);
[vulkan] Add an array view for default_magenta The validation layers get very picky about image view types (rightfully so, I imagine).
2021-12-08 12:08:37 +00:00
Vulkan_UnloadTex (ctx, ctx->default_magenta_array);
[vulkan] Create some default textures Black, white and magenta. This gets glow (full bright) maps working.
2021-01-23 06:40:31 +00:00
}
[vulkan] Abandon bindless rendering At least for now, it is more trouble than it is worth as it (or my implementation of it) breaks lavapipe and renderdoc.
2021-12-17 03:20:32 +00:00
static VkDescriptorImageInfo base_image_info = {
.imageLayout = VK_IMAGE_LAYOUT_SHADER_READ_ONLY_OPTIMAL,
};
static VkWriteDescriptorSet base_image_write = {
.sType = VK_STRUCTURE_TYPE_WRITE_DESCRIPTOR_SET,
.dstBinding = 0,
.descriptorCount = 1,
.descriptorType = VK_DESCRIPTOR_TYPE_COMBINED_IMAGE_SAMPLER,
};
VkDescriptorSet
Vulkan_CreateCombinedImageSampler (vulkan_ctx_t *ctx, VkImageView view,
VkSampler sampler)
{
qfvPushDebug (ctx, "Vulkan_CreateCombinedImageSampler");
qfv_device_t *device = ctx->device;
qfv_devfuncs_t *dfunc = device->funcs;
texturectx_t *tctx = ctx->texture_context;
//FIXME kinda dumb
__auto_type layouts = QFV_AllocDescriptorSetLayoutSet (1, alloca);
for (size_t i = 0; i < layouts->size; i++) {
layouts->a[i] = tctx->setLayout;
}
__auto_type sets = QFV_AllocateDescriptorSet (device, tctx->pool, layouts);
VkDescriptorSet descriptor = sets->a[0];
free (sets);
VkDescriptorImageInfo imageInfo[1];
imageInfo[0] = base_image_info;
imageInfo[0].sampler = sampler;
imageInfo[0].imageView = view;
VkWriteDescriptorSet write[1];
write[0] = base_image_write;
write[0].dstSet = descriptor;
write[0].pImageInfo = imageInfo;
dfunc->vkUpdateDescriptorSets (device->dev, 1, write, 0, 0);
qfvPopDebug (ctx);
return descriptor;
}
VkDescriptorSet
Vulkan_CreateTextureDescriptor (vulkan_ctx_t *ctx, qfv_tex_t *tex,
VkSampler sampler)
{
return Vulkan_CreateCombinedImageSampler (ctx, tex->view, sampler);
}
void
Vulkan_FreeTexture (vulkan_ctx_t *ctx, VkDescriptorSet texture)
{
qfv_device_t *device = ctx->device;
qfv_devfuncs_t *dfunc = device->funcs;
texturectx_t *tctx = ctx->texture_context;
dfunc->vkFreeDescriptorSets (device->dev, tctx->pool, 1, &texture);
}
Reference in a new issue Copy permalink