Mesa (master): i965/cfg: Make cfg_t usable from C.
Matt Turner
mattst88 at kemper.freedesktop.org
Sun Jul 6 05:51:54 UTC 2014
Module: Mesa
Branch: master
Commit: 0db30fcf8935fab2465a63be56fd317e14fdf7c9
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=0db30fcf8935fab2465a63be56fd317e14fdf7c9
Author: Matt Turner <mattst88 at gmail.com>
Date: Sun Jun 29 18:18:53 2014 -0700
i965/cfg: Make cfg_t usable from C.
Acked-by: Topi Pohjolainen <topi.pohjolainen at intel.com>
---
src/mesa/drivers/dri/i965/brw_cfg.h | 10 ++++------
src/mesa/drivers/dri/i965/brw_fs_live_variables.h | 2 +-
src/mesa/drivers/dri/i965/brw_shader.h | 2 +-
3 files changed, 6 insertions(+), 8 deletions(-)
diff --git a/src/mesa/drivers/dri/i965/brw_cfg.h b/src/mesa/drivers/dri/i965/brw_cfg.h
index b55eacb..cdbadde 100644
--- a/src/mesa/drivers/dri/i965/brw_cfg.h
+++ b/src/mesa/drivers/dri/i965/brw_cfg.h
@@ -82,9 +82,8 @@ struct bblock_t {
struct backend_instruction *endif_inst;
};
+struct cfg_t {
#ifdef __cplusplus
-class cfg_t {
-public:
DECLARE_RALLOC_CXX_OPERATORS(cfg_t)
cfg_t(exec_list *instructions);
@@ -95,15 +94,14 @@ public:
void make_block_array();
void dump(backend_visitor *v);
-
+#endif
void *mem_ctx;
/** Ordered list (by ip) of basic blocks */
- exec_list block_list;
- bblock_t **blocks;
+ struct exec_list block_list;
+ struct bblock_t **blocks;
int num_blocks;
};
-#endif
#define foreach_inst_in_block(__type, __inst, __block) \
for (__type *__inst = (__type *)__block->start; \
diff --git a/src/mesa/drivers/dri/i965/brw_fs_live_variables.h b/src/mesa/drivers/dri/i965/brw_fs_live_variables.h
index 13c3eb4..6cc8a98 100644
--- a/src/mesa/drivers/dri/i965/brw_fs_live_variables.h
+++ b/src/mesa/drivers/dri/i965/brw_fs_live_variables.h
@@ -28,7 +28,7 @@
#include "brw_fs.h"
#include "main/bitset.h"
-class cfg_t;
+struct cfg_t;
namespace brw {
diff --git a/src/mesa/drivers/dri/i965/brw_shader.h b/src/mesa/drivers/dri/i965/brw_shader.h
index 558d052..e021820 100644
--- a/src/mesa/drivers/dri/i965/brw_shader.h
+++ b/src/mesa/drivers/dri/i965/brw_shader.h
@@ -80,7 +80,7 @@ struct backend_reg
#ifdef __cplusplus
-class cfg_t;
+struct cfg_t;
struct backend_instruction : public exec_node {
public:
More information about the mesa-commit
mailing list