diff --git a/driver/tests/tex_demo/blitter.h b/driver/tests/tex_demo/blitter.h index 6c44f8c2..7116fc92 100644 --- a/driver/tests/tex_demo/blitter.h +++ b/driver/tests/tex_demo/blitter.h @@ -1,6 +1,6 @@ #include "format.h" -struct GLSurfaceDesc { +struct SurfaceDesc { uint8_t Format; uint8_t *pBits; int32_t Width; @@ -10,12 +10,12 @@ struct GLSurfaceDesc { class BlitTable { public: - typedef void (*PfnCopy)(const GLSurfaceDesc &dstDesc, + typedef void (*PfnCopy)(const SurfaceDesc &dstDesc, uint32_t dstOffsetX, uint32_t dstOffsetY, uint32_t copyWidth, uint32_t copyHeight, - const GLSurfaceDesc &srcDesc, + const SurfaceDesc &srcDesc, uint32_t srcOffsetX, uint32_t srcOffsetY); @@ -183,12 +183,12 @@ public: private: template - static void Copy(const GLSurfaceDesc &dstDesc, + static void Copy(const SurfaceDesc &dstDesc, uint32_t dstOffsetX, uint32_t dstOffsetY, uint32_t copyWidth, uint32_t copyHeight, - const GLSurfaceDesc &srcDesc, + const SurfaceDesc &srcDesc, uint32_t srcOffsetX, uint32_t srcOffsetY) { auto srcBPP = TFormatInfo::CBSIZE; @@ -215,9 +215,9 @@ private: } template - 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 copyHeight, const GLSurfaceDesc &srcDesc, + uint32_t copyHeight, const SurfaceDesc &srcDesc, uint32_t srcOffsetX, uint32_t srcOffsetY) { auto nBPP = sizeof(Type); 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 /*dstOffsetY*/, uint32_t /*copyWidth*/, uint32_t /*copyHeight*/, - const GLSurfaceDesc & /*srcDesc*/, + const SurfaceDesc & /*srcDesc*/, uint32_t /*srcOffsetX*/, uint32_t /*srcOffsetY*/) { diff --git a/driver/tests/tex_demo/demo b/driver/tests/tex_demo/demo deleted file mode 100755 index 9f9bfc7a..00000000 Binary files a/driver/tests/tex_demo/demo and /dev/null differ diff --git a/driver/tests/tex_demo/utils.cpp b/driver/tests/tex_demo/utils.cpp index 342d49d5..304693b2 100644 --- a/driver/tests/tex_demo/utils.cpp +++ b/driver/tests/tex_demo/utils.cpp @@ -162,12 +162,12 @@ void dump_image(const std::vector& pixels, uint32_t width, uint32_t hei } } -int CopyBuffers(const GLSurfaceDesc &dstDesc, +int CopyBuffers(const SurfaceDesc &dstDesc, int32_t dstOffsetX, int32_t dstOffsetY, int32_t copyWidth, int32_t copyHeight, - const GLSurfaceDesc &srcDesc, + const SurfaceDesc &srcDesc, int32_t srcOffsetX, int32_t srcOffsetY) { diff --git a/driver/tests/tex_demo/utils.h b/driver/tests/tex_demo/utils.h index 65a7f412..d22a662b 100644 --- a/driver/tests/tex_demo/utils.h +++ b/driver/tests/tex_demo/utils.h @@ -15,12 +15,12 @@ int SaveTGA(const char *filename, uint32_t height, uint32_t bpp); -int CopyBuffers(const GLSurfaceDesc &dstDesc, +int CopyBuffers(const SurfaceDesc &dstDesc, int32_t dstOffsetX, int32_t dstOffsetY, int32_t copyWidth, int32_t copyHeight, - const GLSurfaceDesc &srcDesc, + const SurfaceDesc &srcDesc, int32_t srcOffsetX, int32_t srcOffsetY); diff --git a/hw/rtl/VX_decode.v b/hw/rtl/VX_decode.v index 3f760bb8..597d347f 100644 --- a/hw/rtl/VX_decode.v +++ b/hw/rtl/VX_decode.v @@ -394,6 +394,7 @@ module VX_decode #( 3'h5: begin op_type = `OP_BITS'(`GPU_TEX); op_mod = `MOD_BITS'(func2); + use_rd = 1; rs3_fp = 0; `USED_REGS (1'b0, rd); `USED_REGS (1'b0, rs1);