Discussion:
[PATCH] svga: add some missing SVGA_STATS_* enum values, prefix strings
(too old to reply)
Brian Paul
2017-06-16 19:21:43 UTC
Permalink
Raw Message
To fix the build when VMX86_STATS is defined.
Also, some minor whitespace changes to match upstream code.
---
src/gallium/drivers/svga/svga_winsys.h | 17 +++++++++++++++--
1 file changed, 15 insertions(+), 2 deletions(-)

diff --git a/src/gallium/drivers/svga/svga_winsys.h b/src/gallium/drivers/svga/svga_winsys.h
index 376707d..8b8b45b 100644
--- a/src/gallium/drivers/svga/svga_winsys.h
+++ b/src/gallium/drivers/svga/svga_winsys.h
@@ -35,7 +35,6 @@
#ifndef SVGA_WINSYS_H_
#define SVGA_WINSYS_H_

-
#include "svga_types.h"
#include "svga_reg.h"
#include "svga3d_reg.h"
@@ -101,6 +100,7 @@ struct svga_winsys_stats_timeframe {

enum svga_stats_count {
SVGA_STATS_COUNT_BLENDSTATE,
+ SVGA_STATS_COUNT_BLITBLITTERCOPY,
SVGA_STATS_COUNT_DEPTHSTENCILSTATE,
SVGA_STATS_COUNT_RASTERIZERSTATE,
SVGA_STATS_COUNT_SAMPLER,
@@ -112,11 +112,16 @@ enum svga_stats_count {
};

enum svga_stats_time {
+ SVGA_STATS_TIME_BLIT,
+ SVGA_STATS_TIME_BLITBLITTER,
+ SVGA_STATS_TIME_BLITFALLBACK,
SVGA_STATS_TIME_BUFFERSFLUSH,
SVGA_STATS_TIME_BUFFERTRANSFERMAP,
SVGA_STATS_TIME_BUFFERTRANSFERUNMAP,
SVGA_STATS_TIME_CONTEXTFINISH,
SVGA_STATS_TIME_CONTEXTFLUSH,
+ SVGA_STATS_TIME_COPYREGION,
+ SVGA_STATS_TIME_COPYREGIONFALLBACK,
SVGA_STATS_TIME_CREATEBACKEDSURFACEVIEW,
SVGA_STATS_TIME_CREATEBUFFER,
SVGA_STATS_TIME_CREATECONTEXT,
@@ -134,6 +139,7 @@ enum svga_stats_time {
SVGA_STATS_TIME_EMITFS,
SVGA_STATS_TIME_EMITGS,
SVGA_STATS_TIME_EMITVS,
+ SVGA_STATS_TIME_EMULATESURFACEVIEW,
SVGA_STATS_TIME_FENCEFINISH,
SVGA_STATS_TIME_GENERATEINDICES,
SVGA_STATS_TIME_HWTNLDRAWARRAYS,
@@ -165,20 +171,26 @@ enum svga_stats_time {

#define SVGA_STATS_COUNT_NAMES \
SVGA_STATS_PREFIX "BlendState", \
+ SVGA_STATS_PREFIX "BlitBlitterCopy", \
SVGA_STATS_PREFIX "DepthStencilState", \
SVGA_STATS_PREFIX "RasterizerState", \
SVGA_STATS_PREFIX "Sampler", \
SVGA_STATS_PREFIX "SamplerView", \
SVGA_STATS_PREFIX "SurfaceWriteFlush", \
SVGA_STATS_PREFIX "TextureReadback", \
- SVGA_STATS_PREFIX "VertexElement"
+ SVGA_STATS_PREFIX "VertexElement" \

#define SVGA_STATS_TIME_NAMES \
+ SVGA_STATS_PREFIX "Blit", \
+ SVGA_STATS_PREFIX "BlitBlitter", \
+ SVGA_STATS_PREFIX "BlitFallback", \
SVGA_STATS_PREFIX "BuffersFlush", \
SVGA_STATS_PREFIX "BufferTransferMap", \
SVGA_STATS_PREFIX "BufferTransferUnmap", \
SVGA_STATS_PREFIX "ContextFinish", \
SVGA_STATS_PREFIX "ContextFlush", \
+ SVGA_STATS_PREFIX "CopyRegion", \
+ SVGA_STATS_PREFIX "CopyRegionFallback", \
SVGA_STATS_PREFIX "CreateBackedSurfaceView", \
SVGA_STATS_PREFIX "CreateBuffer", \
SVGA_STATS_PREFIX "CreateContext", \
@@ -196,6 +208,7 @@ enum svga_stats_time {
SVGA_STATS_PREFIX "EmitFS", \
SVGA_STATS_PREFIX "EmitGS", \
SVGA_STATS_PREFIX "EmitVS", \
+ SVGA_STATS_PREFIX "EmulateSurfaceView", \
SVGA_STATS_PREFIX "FenceFinish", \
SVGA_STATS_PREFIX "GenerateIndices", \
SVGA_STATS_PREFIX "HWtnlDrawArrays", \
--
1.9.1
Charmaine Lee
2017-06-16 19:59:43 UTC
Permalink
Raw Message
Reviewed-by: Charmaine Lee <***@vmware.com>
________________________________________
From: Brian Paul <***@vmware.com>
Sent: Friday, June 16, 2017 12:21 PM
To: mesa-***@lists.freedesktop.org
Cc: Charmaine Lee; Neha Bhende
Subject: [PATCH] svga: add some missing SVGA_STATS_* enum values, prefix strings

To fix the build when VMX86_STATS is defined.
Also, some minor whitespace changes to match upstream code.
---
src/gallium/drivers/svga/svga_winsys.h | 17 +++++++++++++++--
1 file changed, 15 insertions(+), 2 deletions(-)

diff --git a/src/gallium/drivers/svga/svga_winsys.h b/src/gallium/drivers/svga/svga_winsys.h
index 376707d..8b8b45b 100644
--- a/src/gallium/drivers/svga/svga_winsys.h
+++ b/src/gallium/drivers/svga/svga_winsys.h
@@ -35,7 +35,6 @@
#ifndef SVGA_WINSYS_H_
#define SVGA_WINSYS_H_

-
#include "svga_types.h"
#include "svga_reg.h"
#include "svga3d_reg.h"
@@ -101,6 +100,7 @@ struct svga_winsys_stats_timeframe {

enum svga_stats_count {
SVGA_STATS_COUNT_BLENDSTATE,
+ SVGA_STATS_COUNT_BLITBLITTERCOPY,
SVGA_STATS_COUNT_DEPTHSTENCILSTATE,
SVGA_STATS_COUNT_RASTERIZERSTATE,
SVGA_STATS_COUNT_SAMPLER,
@@ -112,11 +112,16 @@ enum svga_stats_count {
};

enum svga_stats_time {
+ SVGA_STATS_TIME_BLIT,
+ SVGA_STATS_TIME_BLITBLITTER,
+ SVGA_STATS_TIME_BLITFALLBACK,
SVGA_STATS_TIME_BUFFERSFLUSH,
SVGA_STATS_TIME_BUFFERTRANSFERMAP,
SVGA_STATS_TIME_BUFFERTRANSFERUNMAP,
SVGA_STATS_TIME_CONTEXTFINISH,
SVGA_STATS_TIME_CONTEXTFLUSH,
+ SVGA_STATS_TIME_COPYREGION,
+ SVGA_STATS_TIME_COPYREGIONFALLBACK,
SVGA_STATS_TIME_CREATEBACKEDSURFACEVIEW,
SVGA_STATS_TIME_CREATEBUFFER,
SVGA_STATS_TIME_CREATECONTEXT,
@@ -134,6 +139,7 @@ enum svga_stats_time {
SVGA_STATS_TIME_EMITFS,
SVGA_STATS_TIME_EMITGS,
SVGA_STATS_TIME_EMITVS,
+ SVGA_STATS_TIME_EMULATESURFACEVIEW,
SVGA_STATS_TIME_FENCEFINISH,
SVGA_STATS_TIME_GENERATEINDICES,
SVGA_STATS_TIME_HWTNLDRAWARRAYS,
@@ -165,20 +171,26 @@ enum svga_stats_time {

#define SVGA_STATS_COUNT_NAMES \
SVGA_STATS_PREFIX "BlendState", \
+ SVGA_STATS_PREFIX "BlitBlitterCopy", \
SVGA_STATS_PREFIX "DepthStencilState", \
SVGA_STATS_PREFIX "RasterizerState", \
SVGA_STATS_PREFIX "Sampler", \
SVGA_STATS_PREFIX "SamplerView", \
SVGA_STATS_PREFIX "SurfaceWriteFlush", \
SVGA_STATS_PREFIX "TextureReadback", \
- SVGA_STATS_PREFIX "VertexElement"
+ SVGA_STATS_PREFIX "VertexElement" \

#define SVGA_STATS_TIME_NAMES \
+ SVGA_STATS_PREFIX "Blit", \
+ SVGA_STATS_PREFIX "BlitBlitter", \
+ SVGA_STATS_PREFIX "BlitFallback", \
SVGA_STATS_PREFIX "BuffersFlush", \
SVGA_STATS_PREFIX "BufferTransferMap", \
SVGA_STATS_PREFIX "BufferTransferUnmap", \
SVGA_STATS_PREFIX "ContextFinish", \
SVGA_STATS_PREFIX "ContextFlush", \
+ SVGA_STATS_PREFIX "CopyRegion", \
+ SVGA_STATS_PREFIX "CopyRegionFallback", \
SVGA_STATS_PREFIX "CreateBackedSurfaceView", \
SVGA_STATS_PREFIX "CreateBuffer", \
SVGA_STATS_PREFIX "CreateContext", \
@@ -196,6 +208,7 @@ enum svga_stats_time {
SVGA_STATS_PREFIX "EmitFS", \
SVGA_STATS_PREFIX "EmitGS", \
SVGA_STATS_PREFIX "EmitVS", \
+ SVGA_STATS_PREFIX "EmulateSurfaceView", \
SVGA_STATS_PREFIX "FenceFinish", \
SVGA_STATS_PREFIX "GenerateIndices", \
SVGA_STATS_PREFIX "HWtnlDrawArrays", \
--
1.9.1

Loading...