From 99ca04ce8cf45c0078cb70b81ccf0d6f32f54c81 Mon Sep 17 00:00:00 2001 From: Blaise Tine Date: Wed, 31 Mar 2021 18:56:03 -0400 Subject: [PATCH] minor update --- driver/tests/tex_demo/Makefile | 2 +- driver/tests/tex_demo/demo | Bin 156616 -> 156616 bytes driver/tests/tex_demo/main.cpp | 2 +- driver/tests/tex_demo/palette.tga | Bin 1068 -> 108 bytes hw/rtl/tex_unit/VX_tex_addr.v | 1 + hw/rtl/tex_unit/VX_tex_define.vh | 4 ++-- 6 files changed, 5 insertions(+), 4 deletions(-) diff --git a/driver/tests/tex_demo/Makefile b/driver/tests/tex_demo/Makefile index 522877a6..2c75c070 100644 --- a/driver/tests/tex_demo/Makefile +++ b/driver/tests/tex_demo/Makefile @@ -1,7 +1,7 @@ RISCV_TOOLCHAIN_PATH ?= /opt/riscv-gnu-toolchain VORTEX_RT_PATH ?= $(wildcard ../../../runtime) -#OPTS ?= -s1.0 +OPTS ?= -f1 VX_CC = $(RISCV_TOOLCHAIN_PATH)/bin/riscv32-unknown-elf-gcc VX_CXX = $(RISCV_TOOLCHAIN_PATH)/bin/riscv32-unknown-elf-g++ diff --git a/driver/tests/tex_demo/demo b/driver/tests/tex_demo/demo index 9d4b0def7ab4a154a99fd588ca019afd406bcd96..54fe58d0c39be70d4689a9b18da70f1a3b00b71d 100755 GIT binary patch delta 77 zcmV-T0J8tc#|g;C39y6$6lMUvWn8$~o4ky3dVEEF4d<@6q_da;fDZvBvl$ZT3IQv# j0v#7E2XJ9*Wps39lO0MZvq(zdB>^RaDR8$bZ~>q5`Yj%p delta 74 zcmV-Q0JZUM<0SzigDG&gDR2Rw^N?2@`~Uy| diff --git a/driver/tests/tex_demo/main.cpp b/driver/tests/tex_demo/main.cpp index 59c1b781..f3e48031 100644 --- a/driver/tests/tex_demo/main.cpp +++ b/driver/tests/tex_demo/main.cpp @@ -20,7 +20,7 @@ /////////////////////////////////////////////////////////////////////////////// const char* kernel_file = "kernel.bin"; -const char* input_file = "toad.tga"; +const char* input_file = "palette.tga"; const char* output_file = "output.tga"; int wrap = 0; int filter = 0; diff --git a/driver/tests/tex_demo/palette.tga b/driver/tests/tex_demo/palette.tga index 2653f445721be446c29e0c34cfa56f6dc7423df5..c342c47f56cd5873ddd2f53a0d304b245b96f72d 100644 GIT binary patch literal 108 zcmZQzU}As(76uSh&|vt_@c%yp1cTTRCXf#VAT~%E1c180Y^V%K1S|zLjv*u{)HTdA Q*wf!nH^R-+$5oF30P=k;8UO$Q literal 1068 zcmZQzU}As(0R|9M&;auOQ-=Qo^;3ZV1MQ~>0`2}!KBmm^AdgdEIY=+%27nA98&DSa zptJ+@0VSBCxCf;i%0iGb$Adghu>&YIfb6&jX@ryp3=APbp{`+`!Jhtpx)E-kKCXHU E03;5B1ONa4 diff --git a/hw/rtl/tex_unit/VX_tex_addr.v b/hw/rtl/tex_unit/VX_tex_addr.v index 1a798213..dda0b297 100644 --- a/hw/rtl/tex_unit/VX_tex_addr.v +++ b/hw/rtl/tex_unit/VX_tex_addr.v @@ -131,6 +131,7 @@ module VX_tex_addr #( end wire [`NUM_THREADS-1:0][`FIXED_FRAC-1:0] u0, v0; + for (genvar i = 0; i < `NUM_THREADS; ++i) begin assign u0[i] = clamped_u[i][0]; assign v0[i] = clamped_v[i][0]; diff --git a/hw/rtl/tex_unit/VX_tex_define.vh b/hw/rtl/tex_unit/VX_tex_define.vh index dec2fe13..4ba00a75 100644 --- a/hw/rtl/tex_unit/VX_tex_define.vh +++ b/hw/rtl/tex_unit/VX_tex_define.vh @@ -28,8 +28,8 @@ `define TEX_LOD_BITS 4 `define TEX_MIP_BITS (`NTEX_BITS + `TEX_LOD_BITS) -`define TEX_WRAP_REPEAT 0 -`define TEX_WRAP_CLAMP 1 +`define TEX_WRAP_CLAMP 0 +`define TEX_WRAP_REPEAT 1 `define TEX_WRAP_MIRROR 2 `define MAX_COLOR_WIDTH 8