diff options
| -rw-r--r-- | src/mesa/drivers/dri/i965/Makefile.sources | 1 | ||||
| -rw-r--r-- | src/mesa/drivers/dri/i965/brw_vec4.cpp | 2 | ||||
| -rw-r--r-- | src/mesa/drivers/dri/i965/brw_vec4_vs.h | 68 | ||||
| -rw-r--r-- | src/mesa/drivers/dri/i965/brw_vec4_vs_visitor.cpp | 2 | ||||
| -rw-r--r-- | src/mesa/drivers/dri/i965/brw_vs.h | 42 |
5 files changed, 71 insertions, 44 deletions
diff --git a/src/mesa/drivers/dri/i965/Makefile.sources b/src/mesa/drivers/dri/i965/Makefile.sources index 633c3dc00a4..1dd109b83ea 100644 --- a/src/mesa/drivers/dri/i965/Makefile.sources +++ b/src/mesa/drivers/dri/i965/Makefile.sources @@ -78,6 +78,7 @@ i965_compiler_FILES = \ brw_vec4_tes.h \ brw_vec4_visitor.cpp \ brw_vec4_vs_visitor.cpp \ + brw_vec4_vs_visitor.h \ brw_vue_map.c \ brw_wm_iz.cpp \ gen6_gs_visitor.cpp \ diff --git a/src/mesa/drivers/dri/i965/brw_vec4.cpp b/src/mesa/drivers/dri/i965/brw_vec4.cpp index fba040aad62..14a4f8544fb 100644 --- a/src/mesa/drivers/dri/i965/brw_vec4.cpp +++ b/src/mesa/drivers/dri/i965/brw_vec4.cpp @@ -24,10 +24,10 @@ #include "brw_vec4.h" #include "brw_fs.h" #include "brw_cfg.h" -#include "brw_vs.h" #include "brw_nir.h" #include "brw_vec4_builder.h" #include "brw_vec4_live_variables.h" +#include "brw_vec4_vs.h" #include "brw_dead_control_flow.h" #include "program/prog_parameter.h" diff --git a/src/mesa/drivers/dri/i965/brw_vec4_vs.h b/src/mesa/drivers/dri/i965/brw_vec4_vs.h new file mode 100644 index 00000000000..8c346d7636a --- /dev/null +++ b/src/mesa/drivers/dri/i965/brw_vec4_vs.h @@ -0,0 +1,68 @@ +/* + * Copyright © 2006 - 2015 Intel Corporation + * + * Permission is hereby granted, free of charge, to any person obtaining a + * copy of this software and associated documentation files (the "Software"), + * to deal in the Software without restriction, including without limitation + * the rights to use, copy, modify, merge, publish, distribute, sublicense, + * and/or sell copies of the Software, and to permit persons to whom the + * Software is furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice (including the next + * paragraph) shall be included in all copies or substantial portions of the + * Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL + * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING + * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS + * IN THE SOFTWARE. + */ + +#ifndef BRW_VEC4_VS_VISITOR_H +#define BRW_VEC4_VS_VISITOR_H + +#include "brw_vec4.h" + +namespace brw { + +class vec4_vs_visitor : public vec4_visitor +{ +public: + vec4_vs_visitor(const struct brw_compiler *compiler, + void *log_data, + const struct brw_vs_prog_key *key, + struct brw_vs_prog_data *vs_prog_data, + const nir_shader *shader, + gl_clip_plane *clip_planes, + void *mem_ctx, + int shader_time_index, + bool use_legacy_snorm_formula); + +protected: + virtual dst_reg *make_reg_for_system_value(int location); + virtual void setup_payload(); + virtual void emit_prolog(); + virtual void emit_thread_end(); + virtual void emit_urb_write_header(int mrf); + virtual void emit_urb_slot(dst_reg reg, int varying); + virtual vec4_instruction *emit_urb_write_opcode(bool complete); + +private: + int setup_attributes(int payload_reg); + void setup_uniform_clipplane_values(); + void emit_clip_distances(dst_reg reg, int offset); + + const struct brw_vs_prog_key *const key; + struct brw_vs_prog_data * const vs_prog_data; + + gl_clip_plane *clip_planes; + + bool use_legacy_snorm_formula; +}; + +} /* namespace brw */ + +#endif /* BRW_VEC4_VS_VISITOR_H */ diff --git a/src/mesa/drivers/dri/i965/brw_vec4_vs_visitor.cpp b/src/mesa/drivers/dri/i965/brw_vec4_vs_visitor.cpp index a300f768767..2c1051c9098 100644 --- a/src/mesa/drivers/dri/i965/brw_vec4_vs_visitor.cpp +++ b/src/mesa/drivers/dri/i965/brw_vec4_vs_visitor.cpp @@ -22,7 +22,7 @@ */ -#include "brw_vs.h" +#include "brw_vec4_vs.h" namespace brw { diff --git a/src/mesa/drivers/dri/i965/brw_vs.h b/src/mesa/drivers/dri/i965/brw_vs.h index 0e015511d95..98b0bf18d90 100644 --- a/src/mesa/drivers/dri/i965/brw_vs.h +++ b/src/mesa/drivers/dri/i965/brw_vs.h @@ -53,48 +53,6 @@ brw_vs_populate_key(struct brw_context *brw, #ifdef __cplusplus } /* extern "C" */ - - -namespace brw { - -class vec4_vs_visitor : public vec4_visitor -{ -public: - vec4_vs_visitor(const struct brw_compiler *compiler, - void *log_data, - const struct brw_vs_prog_key *key, - struct brw_vs_prog_data *vs_prog_data, - const nir_shader *shader, - gl_clip_plane *clip_planes, - void *mem_ctx, - int shader_time_index, - bool use_legacy_snorm_formula); - -protected: - virtual dst_reg *make_reg_for_system_value(int location); - virtual void setup_payload(); - virtual void emit_prolog(); - virtual void emit_thread_end(); - virtual void emit_urb_write_header(int mrf); - virtual void emit_urb_slot(dst_reg reg, int varying); - virtual vec4_instruction *emit_urb_write_opcode(bool complete); - -private: - int setup_attributes(int payload_reg); - void setup_uniform_clipplane_values(); - void emit_clip_distances(dst_reg reg, int offset); - - const struct brw_vs_prog_key *const key; - struct brw_vs_prog_data * const vs_prog_data; - - gl_clip_plane *clip_planes; - - bool use_legacy_snorm_formula; -}; - -} /* namespace brw */ - - #endif #endif |