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

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

Browse Source
This commit is contained in:
Blaise Tine
2021-03-31 18:36:07 -04:00
parent 90e4a800d5 a30e9fbcbc
commit e6cb148ce1
3 changed files with 89 additions and 60 deletions
Download Patch File Download Diff File Expand all files Collapse all files

80
hw/rtl/tex_unit/VX_tex_format.v
View File

@@ -8,14 +8,17 @@ module VX_tex_format #(
input wire [`TEX_FORMAT_BITS-1:0] format,
output wire [`NUM_COLOR_CHANNEL-1:0] color_enable,
output wire [NUM_TEXELS-1:0][63:0] formatted_texel
output wire [NUM_TEXELS-1:0][63:0] formatted_lerp_texel,
output wire [31:0] formatted_pt_texel
);
`UNUSED_PARAM (CORE_ID)
reg [`NUM_COLOR_CHANNEL-1:0] color_enable_r;
reg [NUM_TEXELS-1:0][63:0] formatted_texel_r;
reg [NUM_TEXELS-1:0][63:0] formatted_texel_r;
reg [31:0] formatted_pt_r;
always @(*) begin
// bilerp/trilerp input
for (integer i = 0; i<NUM_TEXELS ;i++ ) begin
case (format)
`TEX_FORMAT_R5G6B5: begin
@@ -32,7 +35,31 @@ module VX_tex_format #(
formatted_texel_r[i][39:32] = `TEX_COLOR_BITS'(texel_data[i][11:8]);
formatted_texel_r[i][55:48] = `TEX_COLOR_BITS'(texel_data[i][15:12]);
if (i == 0)
color_enable_r = 4'b0111;
color_enable_r = 4'b1111;
end
`TEX_FORMAT_L8A8: begin
formatted_texel_r[i][07:00] = `TEX_COLOR_BITS'(texel_data[i][7:0]);
formatted_texel_r[i][23:16] = `TEX_COLOR_BITS'(texel_data[i][15:8]);
formatted_texel_r[i][39:32] = `TEX_COLOR_BITS'(0);
formatted_texel_r[i][55:48] = `TEX_COLOR_BITS'(0);
if (i == 0)
color_enable_r = 4'b0011;
end
`TEX_FORMAT_A8: begin
formatted_texel_r[i][07:00] = `TEX_COLOR_BITS'(texel_data[i][7:0]);
formatted_texel_r[i][23:16] = `TEX_COLOR_BITS'(0);
formatted_texel_r[i][39:32] = `TEX_COLOR_BITS'(0);
formatted_texel_r[i][55:48] = `TEX_COLOR_BITS'(0);
if (i == 0)
color_enable_r = 4'b0001;
end
`TEX_FORMAT_L8: begin
formatted_texel_r[i][07:00] = `TEX_COLOR_BITS'(texel_data[i][7:0]);
formatted_texel_r[i][23:16] = `TEX_COLOR_BITS'(0);
formatted_texel_r[i][39:32] = `TEX_COLOR_BITS'(0);
formatted_texel_r[i][55:48] = `TEX_COLOR_BITS'(0);
if (i == 0)
color_enable_r = 4'b0001;
end
default: begin // `TEX_FORMAT_R8G8B8A8:
formatted_texel_r[i][07:00] = `TEX_COLOR_BITS'(texel_data[i][7:0]);
@@ -44,12 +71,55 @@ module VX_tex_format #(
end
endcase
end
// pt sampling direct output
case (format)
`TEX_FORMAT_R5G6B5: begin
formatted_pt_r[07:00] = {`TEX_COLOR_BITS{1'b1}};
formatted_pt_r[15:08] = `TEX_COLOR_BITS'(texel_data[0][4:0]);
formatted_pt_r[23:16] = `TEX_COLOR_BITS'(texel_data[0][10:5]);
formatted_pt_r[31:24] = `TEX_COLOR_BITS'(texel_data[0][15:11]);
end
`TEX_FORMAT_R4G4B4A4: begin
formatted_pt_r[07:00] = `TEX_COLOR_BITS'(texel_data[0][3:0]);
formatted_pt_r[15:08] = `TEX_COLOR_BITS'(texel_data[0][7:4]);
formatted_pt_r[23:16] = `TEX_COLOR_BITS'(texel_data[0][11:8]);
formatted_pt_r[31:24] = `TEX_COLOR_BITS'(texel_data[0][15:12]);
end
`TEX_FORMAT_L8A8: begin
formatted_pt_r[07:00] = `TEX_COLOR_BITS'(texel_data[0][7:0]);
formatted_pt_r[15:08] = `TEX_COLOR_BITS'(texel_data[0][15:8]);
formatted_pt_r[23:16] = `TEX_COLOR_BITS'(0);
formatted_pt_r[31:24] = `TEX_COLOR_BITS'(0);
end
`TEX_FORMAT_A8: begin
formatted_pt_r[07:00] = `TEX_COLOR_BITS'(texel_data[0][7:0]);
formatted_pt_r[15:08] = `TEX_COLOR_BITS'(0);
formatted_pt_r[23:16] = `TEX_COLOR_BITS'(0);
formatted_pt_r[31:24] = `TEX_COLOR_BITS'(0);
end
`TEX_FORMAT_L8: begin
formatted_pt_r[07:00] = `TEX_COLOR_BITS'(texel_data[0][7:0]);
formatted_pt_r[15:08] = `TEX_COLOR_BITS'(0);
formatted_pt_r[23:16] = `TEX_COLOR_BITS'(0);
formatted_pt_r[31:24] = `TEX_COLOR_BITS'(0);
end
default: begin // `TEX_FORMAT_R8G8B8A8:
formatted_pt_r[07:00] = `TEX_COLOR_BITS'(texel_data[0][7:0]);
formatted_pt_r[15:08] = `TEX_COLOR_BITS'(texel_data[0][15:8]);
formatted_pt_r[23:16] = `TEX_COLOR_BITS'(texel_data[0][23:16]);
formatted_pt_r[31:24] = `TEX_COLOR_BITS'(texel_data[0][31:24]);
end
endcase
end
assign color_enable = color_enable_r;
assign formatted_pt_texel = formatted_pt_r;
for (genvar i = 0; i < NUM_TEXELS; i++) begin
assign formatted_texel[i] = formatted_texel_r[i] & 64'h00ff00ff00ff00ff;
assign formatted_lerp_texel[i] = formatted_texel_r[i] & 64'h00ff00ff00ff00ff;
end
endmodule

12
hw/rtl/tex_unit/VX_tex_sampler.v
View File

@@ -34,13 +34,14 @@ module VX_tex_sampler #(
`UNUSED_PARAM (CORE_ID)
wire [`NUM_THREADS-1:0][31:0] req_data;
wire [`NUM_THREADS-1:0][31:0] req_data_bilerp;
wire stall_out;
for (genvar i = 0; i < `NUM_THREADS; i++) begin
wire [31:0] req_data_bilerp;
wire [3:0][63:0] formatted_data;
wire [31:0] formatted_pt_data;
wire [`NUM_COLOR_CHANNEL-1:0] color_enable;
VX_tex_format #(
@@ -51,7 +52,8 @@ module VX_tex_sampler #(
.format (req_format),
.color_enable (color_enable),
.formatted_texel(formatted_data)
.formatted_lerp_texel(formatted_data),
.formatted_pt_texel(formatted_pt_data)
);
VX_tex_bilerp #(
@@ -63,13 +65,11 @@ module VX_tex_sampler #(
.color_enable (color_enable),
.texels (formatted_data),
.sampled_data (req_data_bilerp[i])
.sampled_data (req_data_bilerp)
);
end
assign req_data[i] = (req_filter == `TEX_FILTER_BITS'(0)) ? formatted_pt_data : req_data_bilerp;
for (genvar i = 0; i < `NUM_THREADS; i++) begin
assign req_data[i] = (req_filter == `TEX_FILTER_BITS'(0)) ? req_texels[i][0] : req_data_bilerp[i];
end
assign stall_out = rsp_valid && ~rsp_ready;