Merge branch 'graphics' of https://github.com/vortexgpgpu/vortex-dev into graphics

Conflicts:
	driver/tests/tex_demo/main.cpp
This commit is contained in:
Blaise Tine
2021-04-15 22:37:29 -07:00
10 changed files with 193 additions and 83 deletions

View File

@@ -12,8 +12,7 @@ inline uint32_t ilog2 (uint32_t value) {
int LoadTGA(const char *filename,
std::vector<uint8_t> &pixels,
uint32_t *width,
uint32_t *height,
uint32_t *bpp);
uint32_t *height);
int SaveTGA(const char *filename,
const std::vector<uint8_t> &pixels,
@@ -21,13 +20,23 @@ int SaveTGA(const char *filename,
uint32_t height,
uint32_t bpp);
int CopyBuffers(const SurfaceDesc &dstDesc,
int CopyBuffers(SurfaceDesc &dstDesc,
int32_t dstOffsetX,
int32_t dstOffsetY,
int32_t copyWidth,
int32_t copyHeight,
uint32_t copyWidth,
uint32_t copyHeight,
const SurfaceDesc &srcDesc,
int32_t srcOffsetX,
int32_t srcOffsetY);
void dump_image(const std::vector<uint8_t>& pixels, uint32_t width, uint32_t height, uint32_t bpp);
int ConvertImage(std::vector<uint8_t>& dst_pixels,
const std::vector<uint8_t>& src_pixels,
uint32_t width,
uint32_t height,
ePixelFormat src_format,
ePixelFormat dst_format);
void dump_image(const std::vector<uint8_t>& pixels,
uint32_t width,
uint32_t height,
uint32_t bpp);