wu-arch/vortex
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

minor update

Browse Source
This commit is contained in:
Blaise Tine
2021-04-05 04:25:40 -04:00
parent d38d512d42
commit bbd65a19b5
5 changed files with 14 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
driver/tests/tex_demo/blitter.h
View File

@@ -1,6 +1,6 @@
#include "format.h" #include "format.h"
struct GLSurfaceDesc { struct SurfaceDesc {
uint8_t Format; uint8_t Format;
uint8_t *pBits; uint8_t *pBits;
int32_t Width; int32_t Width;
@@ -10,12 +10,12 @@ struct GLSurfaceDesc {
class BlitTable { class BlitTable {
public: public:
typedef void (*PfnCopy)(const GLSurfaceDesc &dstDesc, typedef void (*PfnCopy)(const SurfaceDesc &dstDesc,
uint32_t dstOffsetX, uint32_t dstOffsetX,
uint32_t dstOffsetY, uint32_t dstOffsetY,
uint32_t copyWidth, uint32_t copyWidth,
uint32_t copyHeight, uint32_t copyHeight,
const GLSurfaceDesc &srcDesc, const SurfaceDesc &srcDesc,
uint32_t srcOffsetX, uint32_t srcOffsetX,
uint32_t srcOffsetY); uint32_t srcOffsetY);
@@ -183,12 +183,12 @@ public:
private: private:
template <ePixelFormat SrcFormat, ePixelFormat DstFormat> template <ePixelFormat SrcFormat, ePixelFormat DstFormat>
static void Copy(const GLSurfaceDesc &dstDesc, static void Copy(const SurfaceDesc &dstDesc,
uint32_t dstOffsetX, uint32_t dstOffsetX,
uint32_t dstOffsetY, uint32_t dstOffsetY,
uint32_t copyWidth, uint32_t copyWidth,
uint32_t copyHeight, uint32_t copyHeight,
const GLSurfaceDesc &srcDesc, const SurfaceDesc &srcDesc,
uint32_t srcOffsetX, uint32_t srcOffsetX,
uint32_t srcOffsetY) { uint32_t srcOffsetY) {
auto srcBPP = TFormatInfo<SrcFormat>::CBSIZE; auto srcBPP = TFormatInfo<SrcFormat>::CBSIZE;
@@ -215,9 +215,9 @@ private:
} }
template <typename Type> template <typename Type>
static void CopyFast(const GLSurfaceDesc &dstDesc, uint32_t dstOffsetX, static void CopyFast(const SurfaceDesc &dstDesc, uint32_t dstOffsetX,
uint32_t dstOffsetY, uint32_t copyWidth, uint32_t dstOffsetY, uint32_t copyWidth,
uint32_t copyHeight, const GLSurfaceDesc &srcDesc, uint32_t copyHeight, const SurfaceDesc &srcDesc,
uint32_t srcOffsetX, uint32_t srcOffsetY) { uint32_t srcOffsetX, uint32_t srcOffsetY) {
auto nBPP = sizeof(Type); auto nBPP = sizeof(Type);
auto srcNextLine = srcDesc.Pitch; auto srcNextLine = srcDesc.Pitch;
@@ -237,12 +237,12 @@ private:
} }
} }
static void CopyInvalid(const GLSurfaceDesc & /*dstDesc*/, static void CopyInvalid(const SurfaceDesc & /*dstDesc*/,
uint32_t /*dstOffsetX*/, uint32_t /*dstOffsetX*/,
uint32_t /*dstOffsetY*/, uint32_t /*dstOffsetY*/,
uint32_t /*copyWidth*/, uint32_t /*copyWidth*/,
uint32_t /*copyHeight*/, uint32_t /*copyHeight*/,
const GLSurfaceDesc & /*srcDesc*/, const SurfaceDesc & /*srcDesc*/,
uint32_t /*srcOffsetX*/, uint32_t /*srcOffsetX*/,
uint32_t /*srcOffsetY*/) uint32_t /*srcOffsetY*/)
{ {

BIN
driver/tests/tex_demo/demo
View File

Binary file not shown.

4
driver/tests/tex_demo/utils.cpp
View File

@@ -162,12 +162,12 @@ void dump_image(const std::vector<uint8_t>& pixels, uint32_t width, uint32_t hei
} }
} }
int CopyBuffers(const GLSurfaceDesc &dstDesc, int CopyBuffers(const SurfaceDesc &dstDesc,
int32_t dstOffsetX, int32_t dstOffsetX,
int32_t dstOffsetY, int32_t dstOffsetY,
int32_t copyWidth, int32_t copyWidth,
int32_t copyHeight, int32_t copyHeight,
const GLSurfaceDesc &srcDesc, const SurfaceDesc &srcDesc,
int32_t srcOffsetX, int32_t srcOffsetX,
int32_t srcOffsetY) { int32_t srcOffsetY) {

4
driver/tests/tex_demo/utils.h
View File

@@ -15,12 +15,12 @@ int SaveTGA(const char *filename,
uint32_t height, uint32_t height,
uint32_t bpp); uint32_t bpp);
int CopyBuffers(const GLSurfaceDesc &dstDesc, int CopyBuffers(const SurfaceDesc &dstDesc,
int32_t dstOffsetX, int32_t dstOffsetX,
int32_t dstOffsetY, int32_t dstOffsetY,
int32_t copyWidth, int32_t copyWidth,
int32_t copyHeight, int32_t copyHeight,
const GLSurfaceDesc &srcDesc, const SurfaceDesc &srcDesc,
int32_t srcOffsetX, int32_t srcOffsetX,
int32_t srcOffsetY); int32_t srcOffsetY);

1
hw/rtl/VX_decode.v
View File

@@ -394,6 +394,7 @@ module VX_decode #(
3'h5: begin 3'h5: begin
op_type = `OP_BITS'(`GPU_TEX); op_type = `OP_BITS'(`GPU_TEX);
op_mod = `MOD_BITS'(func2); op_mod = `MOD_BITS'(func2);
use_rd = 1;
rs3_fp = 0; rs3_fp = 0;
`USED_REGS (1'b0, rd); `USED_REGS (1'b0, rd);
`USED_REGS (1'b0, rs1); `USED_REGS (1'b0, rs1);