Skip to content

Separate Buffer/Encoder for RenderPass Encoders #1300

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Jun 11, 2017
Merged

Separate Buffer/Encoder for RenderPass Encoders #1300

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
aa344f3
Separate Buffer/Encoder for RenderPass Encoders
JohnColanduoni Jun 9, 2017
4ed3832
Bring DX12 backend up to date with corell
JohnColanduoni Jun 9, 2017
d78585d
Hide RenderPassBuffer traits from documentation
JohnColanduoni Jun 10, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 1 addition & 2 deletions examples/trianglell/main.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -405,8 +405,7 @@ fn main() {
cmd_buffer.bind_graphics_descriptor_sets(&pipeline_layout, 0, &[&set0[0], &set1[0]]);

{
let mut encoder = back::RenderPassInlineEncoder::begin(
&mut cmd_buffer,
let mut encoder = cmd_buffer.begin_render_pass_inline(
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Great! Much better.

&render_pass,
&framebuffers[frame.id()],
target::Rect { x: 0, y: 0, w: pixel_width, h: pixel_height },
Expand Down
192 changes: 100 additions & 92 deletions src/backend/dx12ll/src/command.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@ use winapi::*;

use core::{self, command, memory, pso, state, target, IndexType, VertexCount, VertexOffset};
use core::buffer::IndexBufferView;
use core::command::{RenderPassInlineEncoder, RenderPassSecondaryEncoder, Encoder};
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

nit: command is already included, so there should be either just command or all the types we use from it for consistency

use data;
use native::{self, CommandBuffer, GeneralCommandBuffer, GraphicsCommandBuffer,
ComputeCommandBuffer, TransferCommandBuffer, SubpassCommandBuffer, RenderPass, FrameBuffer};
Expand Down Expand Up @@ -379,6 +380,9 @@ impl_transfer_cmd_buffer!(TransferCommandBuffer);
macro_rules! impl_graphics_cmd_buffer {
($buffer:ident) => (
impl core::GraphicsCommandBuffer<R> for $buffer {
type InlineBuffer = RenderPassInlineBuffer;
type SecondaryBuffer = RenderPassSecondaryBuffer;

fn clear_depth_stencil(&mut self, dsv: &native::DepthStencilView, depth: Option<target::Depth>, stencil: Option<target::Stencil>) {
self.0.clear_depth_stencil(dsv, depth, stencil)
}
Expand Down Expand Up @@ -445,123 +449,127 @@ impl_graphics_cmd_buffer!(ComputeCommandBuffer);

// TODO: subpass command buffer

pub struct RenderPassInlineEncoder<'cb, 'rp, 'fb, 'enc: 'cb> {
command_buffer: &'cb mut command::Encoder<'enc, GraphicsCommandBuffer>,
render_pass: &'rp RenderPass,
framebuffer: &'fb FrameBuffer,
pub struct RenderPassInlineBuffer {
}

impl<'cb, 'rp, 'fb, 'enc> command::RenderPassEncoder<'cb, 'rp, 'fb, 'enc, GraphicsCommandBuffer, R> for RenderPassInlineEncoder<'cb, 'rp, 'fb, 'enc> {
type SecondaryEncoder = RenderPassSecondaryEncoder<'cb, 'rp, 'fb, 'enc>;
type InlineEncoder = RenderPassInlineEncoder<'cb, 'rp, 'fb, 'enc>;

fn begin(command_buffer: &'cb mut command::Encoder<'enc, GraphicsCommandBuffer>,
render_pass: &'rp RenderPass,
framebuffer: &'fb FrameBuffer,
render_area: target::Rect,
clear_values: &[command::ClearValue]
) -> Self {
RenderPassInlineEncoder {
command_buffer,
render_pass,
framebuffer,
}
}
macro_rules! impl_render_pass_inline_buffer {
($graphics_buffer:ident) => {
impl command::RenderPassInlineBuffer<$graphics_buffer, R> for RenderPassInlineBuffer {
fn begin(command_buffer: &mut Encoder<$graphics_buffer>,
render_pass: &RenderPass,
framebuffer: &FrameBuffer,
render_area: target::Rect,
clear_values: &[command::ClearValue]
) -> Self {
RenderPassInlineBuffer {
}
}

fn next_subpass(self) -> Self::SecondaryEncoder {
unimplemented!()
}
fn finish(&mut self,
command_buffer: &mut $graphics_buffer,
render_pass: &native::RenderPass,
framebuffer: &native::FrameBuffer) {
}

fn next_subpass_inline(self) -> Self::InlineEncoder {
unimplemented!()
}
}
fn next_subpass(&mut self) -> RenderPassSecondaryBuffer {
unimplemented!()
}

impl<'cb, 'rp, 'fb, 'enc> command::RenderPassInlineEncoder<'cb, 'rp, 'fb, 'enc, GraphicsCommandBuffer, R> for RenderPassInlineEncoder<'cb, 'rp, 'fb, 'enc> {
fn clear_attachment(&mut self) {
unimplemented!()
}
fn next_subpass_inline(&mut self) -> Self {
unimplemented!()
}

fn draw(&mut self, start: VertexCount, count: VertexCount, instance: Option<command::InstanceParams>) {
self.command_buffer.0.draw(start, count, instance)
}
fn clear_attachment(encoder: &mut RenderPassInlineEncoder<$graphics_buffer, R>) {
unimplemented!()
}

fn draw_indexed(&mut self, start: VertexCount, count: VertexCount, base: VertexOffset, instance: Option<command::InstanceParams>) {
unimplemented!()
}
fn draw(encoder: &mut RenderPassInlineEncoder<$graphics_buffer, R>, start: VertexCount, count: VertexCount, instance: Option<command::InstanceParams>) {
encoder.command_buffer.0.draw(start, count, instance)
}

fn draw_indirect(&mut self) {
unimplemented!()
}
fn draw_indexed(encoder: &mut RenderPassInlineEncoder<$graphics_buffer, R>, start: VertexCount, count: VertexCount, base: VertexOffset, instance: Option<command::InstanceParams>) {
unimplemented!()
}

fn draw_indexed_indirect(&mut self) {
unimplemented!()
}
fn draw_indirect(encoder: &mut RenderPassInlineEncoder<$graphics_buffer, R>) {
unimplemented!()
}

fn bind_index_buffer(&mut self, ibv: IndexBufferView<R>) {
unimplemented!()
}
fn draw_indexed_indirect(encoder: &mut RenderPassInlineEncoder<$graphics_buffer, R>) {
unimplemented!()
}

fn bind_vertex_buffers(&mut self, vbs: pso::VertexBufferSet<R>) {
unimplemented!()
}
fn bind_index_buffer(encoder: &mut RenderPassInlineEncoder<$graphics_buffer, R>, ibv: IndexBufferView<R>) {
unimplemented!()
}

fn set_viewports(&mut self, viewports: &[target::Rect]) {
self.command_buffer.0.set_viewports(viewports)
}
fn bind_vertex_buffers(encoder: &mut RenderPassInlineEncoder<$graphics_buffer, R>, vbs: pso::VertexBufferSet<R>) {
unimplemented!()
}

fn set_scissors(&mut self, scissors: &[target::Rect]) {
self.command_buffer.0.set_scissors(scissors)
}
fn set_viewports(encoder: &mut RenderPassInlineEncoder<$graphics_buffer, R>, viewports: &[target::Rect]) {
encoder.command_buffer.0.set_viewports(viewports)
}

fn set_ref_values(&mut self, rv: state::RefValues) {
self.command_buffer.0.set_ref_values(rv)
}
fn set_scissors(encoder: &mut RenderPassInlineEncoder<$graphics_buffer, R>, scissors: &[target::Rect]) {
encoder.command_buffer.0.set_scissors(scissors)
}

fn bind_graphics_pipeline(&mut self, pipeline: &native::GraphicsPipeline) {
self.command_buffer.0.bind_graphics_pipeline(pipeline)
}
fn set_ref_values(encoder: &mut RenderPassInlineEncoder<$graphics_buffer, R>, rv: state::RefValues) {
encoder.command_buffer.0.set_ref_values(rv)
}

fn bind_graphics_descriptor_sets(&mut self, layout: &native::PipelineLayout, first_set: usize, sets: &[&native::DescriptorSet]) {
//self.0.bind_descriptor_sets(vk::PipelineBindPoint::Graphics, layout, first_set, sets)
unimplemented!()
}
fn bind_graphics_pipeline(encoder: &mut RenderPassInlineEncoder<$graphics_buffer, R>, pipeline: &native::GraphicsPipeline) {
encoder.command_buffer.0.bind_graphics_pipeline(pipeline)
}

fn push_constants(&mut self) {
fn bind_graphics_descriptor_sets(encoder: &mut RenderPassInlineEncoder<$graphics_buffer, R>, layout: &native::PipelineLayout, first_set: usize, sets: &[&native::DescriptorSet]) {
//self.0.bind_descriptor_sets(vk::PipelineBindPoint::Graphics, layout, first_set, sets)
unimplemented!()
}

fn push_constants(encoder: &mut RenderPassInlineEncoder<$graphics_buffer, R>) {

}
}
}
}

pub struct RenderPassSecondaryEncoder<'cb, 'rp, 'fb, 'enc: 'cb> {
command_buffer: &'cb mut command::Encoder<'enc, GraphicsCommandBuffer>,
render_pass: &'rp RenderPass,
framebuffer: &'fb FrameBuffer,
impl_render_pass_inline_buffer!(GeneralCommandBuffer);
impl_render_pass_inline_buffer!(GraphicsCommandBuffer);

pub struct RenderPassSecondaryBuffer {
}

impl<'cb, 'rp, 'fb, 'enc> command::RenderPassEncoder<'cb, 'rp, 'fb, 'enc, GraphicsCommandBuffer, R> for RenderPassSecondaryEncoder<'cb, 'rp, 'fb, 'enc> {
type SecondaryEncoder = RenderPassSecondaryEncoder<'cb, 'rp, 'fb, 'enc>;
type InlineEncoder = RenderPassInlineEncoder<'cb, 'rp, 'fb, 'enc>;

fn begin(command_buffer: &'cb mut command::Encoder<'enc, GraphicsCommandBuffer>,
render_pass: &'rp RenderPass,
framebuffer: &'fb FrameBuffer,
render_area: target::Rect,
clear_values: &[command::ClearValue]
) -> Self {
RenderPassSecondaryEncoder {
command_buffer,
render_pass,
framebuffer,
}
}
macro_rules! impl_render_pass_secondary_buffer {
($graphics_buffer:ident) => {
impl command::RenderPassSecondaryBuffer<$graphics_buffer, R> for RenderPassSecondaryBuffer {
fn begin(command_buffer: &mut Encoder<$graphics_buffer>,
render_pass: &RenderPass,
framebuffer: &FrameBuffer,
render_area: target::Rect,
clear_values: &[command::ClearValue]
) -> Self {
RenderPassSecondaryBuffer {
}
}

fn next_subpass(self) -> Self::SecondaryEncoder {
unimplemented!()
}
fn finish(&mut self,
command_buffer: &mut $graphics_buffer,
render_pass: &native::RenderPass,
framebuffer: &native::FrameBuffer) {
}

fn next_subpass_inline(self) -> Self::InlineEncoder {
unimplemented!()
fn next_subpass(&mut self) -> Self {
unimplemented!()
}

fn next_subpass_inline(&mut self) -> RenderPassInlineBuffer {
unimplemented!()
}
}
}
}

impl<'cb, 'rp, 'fb, 'enc> command::RenderPassSecondaryEncoder<'cb, 'rp, 'fb, 'enc, GraphicsCommandBuffer, R> for RenderPassSecondaryEncoder<'cb, 'rp, 'fb, 'enc> { }
impl_render_pass_secondary_buffer!(GeneralCommandBuffer);
impl_render_pass_secondary_buffer!(GraphicsCommandBuffer);
1 change: 0 additions & 1 deletion src/backend/dx12ll/src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,6 @@ mod native;
mod pool;
mod state;

pub use command::{RenderPassInlineEncoder, RenderPassSecondaryEncoder};
pub use pool::{GeneralCommandPool, GraphicsCommandPool,
ComputeCommandPool, TransferCommandPool, SubpassCommandPool};

Expand Down
Loading