From: Marek Olšák <marek.ol...@amd.com>
---
src/gallium/auxiliary/hud/hud_context.c | 46 -------------------------------
src/gallium/auxiliary/hud/hud_private.h | 48 +++++++++++++++++++++++++++++++++
2 files changed, 48 insertions(+), 46 deletions(-)
diff --git a/src/gallium/auxiliary/hud/hud_context.c
b/src/gallium/auxiliary/hud/hud_context.c
index 922ab96..f32831b 100644
--- a/src/gallium/auxiliary/hud/hud_context.c
+++ b/src/gallium/auxiliary/hud/hud_context.c
@@ -32,83 +32,37 @@
* The HUD is controlled with the GALLIUM_HUD environment variable.
* Set GALLIUM_HUD=help for more info.
*/
#include <inttypes.h>
#include <signal.h>
#include <stdio.h>
#include "hud/hud_context.h"
#include "hud/hud_private.h"
-#include "hud/font.h"
#include "cso_cache/cso_context.h"
#include "util/u_draw_quad.h"
#include "util/u_format.h"
#include "util/u_inlines.h"
#include "util/u_memory.h"
#include "util/u_math.h"
#include "util/u_sampler.h"
#include "util/u_simple_shaders.h"
#include "util/u_string.h"
#include "util/u_upload_mgr.h"
#include "tgsi/tgsi_text.h"
#include "tgsi/tgsi_dump.h"
/* Control the visibility of all HUD contexts */
static boolean huds_visible = TRUE;
-struct hud_context {
- struct pipe_context *pipe;
- struct cso_context *cso;
-
- struct hud_batch_query_context *batch_query;
- struct list_head pane_list;
-
- /* states */
- struct pipe_blend_state no_blend, alpha_blend;
- struct pipe_depth_stencil_alpha_state dsa;
- void *fs_color, *fs_text;
- struct pipe_rasterizer_state rasterizer, rasterizer_aa_lines;
- void *vs;
- struct pipe_vertex_element velems[2];
-
- /* font */
- struct util_font font;
- struct pipe_sampler_view *font_sampler_view;
- struct pipe_sampler_state font_sampler_state;
-
- /* VS constant buffer */
- struct {
- float color[4];
- float two_div_fb_width;
- float two_div_fb_height;
- float translate[2];
- float scale[2];
- float padding[2];
- } constants;
- struct pipe_constant_buffer constbuf;
-
- unsigned fb_width, fb_height;
-
- /* vertices for text and background drawing are accumulated here and then
- * drawn all at once */
- struct vertex_queue {
- float *vertices;
- struct pipe_vertex_buffer vbuf;
- unsigned max_num_vertices;
- unsigned num_vertices;
- unsigned buffer_size;
- } text, bg, whitelines, color_prims;
-
- bool has_srgb;
-};
#ifdef PIPE_OS_UNIX
static void
signal_visible_handler(int sig, siginfo_t *siginfo, void *context)
{
huds_visible = !huds_visible;
}
#endif
static void
diff --git a/src/gallium/auxiliary/hud/hud_private.h
b/src/gallium/auxiliary/hud/hud_private.h
index bf9962d..f765bd9 100644
--- a/src/gallium/auxiliary/hud/hud_private.h
+++ b/src/gallium/auxiliary/hud/hud_private.h
@@ -22,21 +22,69 @@
* 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 HUD_PRIVATE_H
#define HUD_PRIVATE_H
#include "pipe/p_context.h"
+#include "pipe/p_state.h"
#include "util/list.h"
+#include "hud/font.h"
+
+struct hud_context {
+ struct pipe_context *pipe;
+ struct cso_context *cso;
+
+ struct hud_batch_query_context *batch_query;
+ struct list_head pane_list;
+
+ /* states */
+ struct pipe_blend_state no_blend, alpha_blend;
+ struct pipe_depth_stencil_alpha_state dsa;
+ void *fs_color, *fs_text;
+ struct pipe_rasterizer_state rasterizer, rasterizer_aa_lines;
+ void *vs;
+ struct pipe_vertex_element velems[2];
+
+ /* font */
+ struct util_font font;
+ struct pipe_sampler_view *font_sampler_view;
+ struct pipe_sampler_state font_sampler_state;
+
+ /* VS constant buffer */
+ struct {
+ float color[4];
+ float two_div_fb_width;
+ float two_div_fb_height;
+ float translate[2];
+ float scale[2];
+ float padding[2];
+ } constants;
+ struct pipe_constant_buffer constbuf;
+
+ unsigned fb_width, fb_height;
+
+ /* vertices for text and background drawing are accumulated here and then
+ * drawn all at once */
+ struct vertex_queue {
+ float *vertices;
+ struct pipe_vertex_buffer vbuf;
+ unsigned max_num_vertices;
+ unsigned num_vertices;
+ unsigned buffer_size;
+ } text, bg, whitelines, color_prims;
+
+ bool has_srgb;
+};
struct hud_graph {
/* initialized by common code */
struct list_head head;
struct hud_pane *pane;
float color[3];
float *vertices; /* ring buffer of vertices */
/* name and query */
char name[128];
--
2.7.4
_______________________________________________
mesa-dev mailing list
mesa-dev@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/mesa-dev
