[linux-port] Remove/dummy unused class components (#1333)
Clang is smart enough to detect when a class member function or variable is not used and emits a warning for that case. This removes all such members as well as any corresponding parameters and other variables that might have been used to initialize such. Fixes 8 clang warnings. NotOptimized in DxilGenerationPass echoed in places that made us think that it might be needed at some point in spite of not being used now. So it gets a dummy reference instead of being removed.
This commit is contained in:
Родитель
fb581f6228
Коммит
92f7997a9d
|
@ -208,7 +208,7 @@ class DxilGenerationPass : public ModulePass {
|
||||||
public:
|
public:
|
||||||
static char ID; // Pass identification, replacement for typeid
|
static char ID; // Pass identification, replacement for typeid
|
||||||
explicit DxilGenerationPass(bool NoOpt = false)
|
explicit DxilGenerationPass(bool NoOpt = false)
|
||||||
: ModulePass(ID), m_pHLModule(nullptr), NotOptimized(NoOpt), m_extensionsCodegenHelper(nullptr) {}
|
: ModulePass(ID), m_pHLModule(nullptr), m_extensionsCodegenHelper(nullptr), NotOptimized(NoOpt) {}
|
||||||
|
|
||||||
const char *getPassName() const override { return "DXIL Generator"; }
|
const char *getPassName() const override { return "DXIL Generator"; }
|
||||||
|
|
||||||
|
@ -301,6 +301,8 @@ public:
|
||||||
if (!m_HasDbgInfo)
|
if (!m_HasDbgInfo)
|
||||||
DxilMod.StripDebugRelatedCode();
|
DxilMod.StripDebugRelatedCode();
|
||||||
|
|
||||||
|
(void)NotOptimized; // Dummy out unused member to silence warnings
|
||||||
|
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -1328,11 +1330,9 @@ INITIALIZE_PASS(HLEnsureMetadata, "hlsl-hlensure", "HLSL High-Level Metadata Ens
|
||||||
|
|
||||||
namespace {
|
namespace {
|
||||||
class DxilPrecisePropagatePass : public ModulePass {
|
class DxilPrecisePropagatePass : public ModulePass {
|
||||||
HLModule *m_pHLModule;
|
|
||||||
|
|
||||||
public:
|
public:
|
||||||
static char ID; // Pass identification, replacement for typeid
|
static char ID; // Pass identification, replacement for typeid
|
||||||
explicit DxilPrecisePropagatePass() : ModulePass(ID), m_pHLModule(nullptr) {}
|
explicit DxilPrecisePropagatePass() : ModulePass(ID) {}
|
||||||
|
|
||||||
const char *getPassName() const override { return "DXIL Precise Propagate"; }
|
const char *getPassName() const override { return "DXIL Precise Propagate"; }
|
||||||
|
|
||||||
|
@ -1571,13 +1571,12 @@ private:
|
||||||
char DxilLegalizeStaticResourceUsePass::ID = 0;
|
char DxilLegalizeStaticResourceUsePass::ID = 0;
|
||||||
|
|
||||||
class DxilLegalizeResourceUsePass : public FunctionPass {
|
class DxilLegalizeResourceUsePass : public FunctionPass {
|
||||||
HLModule *m_pHLModule;
|
|
||||||
void getAnalysisUsage(AnalysisUsage &AU) const override;
|
void getAnalysisUsage(AnalysisUsage &AU) const override;
|
||||||
|
|
||||||
public:
|
public:
|
||||||
static char ID; // Pass identification, replacement for typeid
|
static char ID; // Pass identification, replacement for typeid
|
||||||
explicit DxilLegalizeResourceUsePass()
|
explicit DxilLegalizeResourceUsePass()
|
||||||
: FunctionPass(ID), m_pHLModule(nullptr) {}
|
: FunctionPass(ID) {}
|
||||||
|
|
||||||
const char *getPassName() const override {
|
const char *getPassName() const override {
|
||||||
return "DXIL Legalize Resource Use";
|
return "DXIL Legalize Resource Use";
|
||||||
|
|
|
@ -41,8 +41,7 @@ DEFINE_ENUM_FLAG_OPERATORS(DxilRootDescriptorFlags)
|
||||||
DEFINE_ENUM_FLAG_OPERATORS(DxilDescriptorRangeFlags)
|
DEFINE_ENUM_FLAG_OPERATORS(DxilDescriptorRangeFlags)
|
||||||
|
|
||||||
RootSignatureTokenizer::RootSignatureTokenizer(const char *pStr, size_t len)
|
RootSignatureTokenizer::RootSignatureTokenizer(const char *pStr, size_t len)
|
||||||
: m_pOrigStr(pStr)
|
: m_pStrPos(pStr)
|
||||||
, m_pStrPos(pStr)
|
|
||||||
, m_pEndPos(pStr + len)
|
, m_pEndPos(pStr + len)
|
||||||
{
|
{
|
||||||
m_TokenBufferIdx = 0;
|
m_TokenBufferIdx = 0;
|
||||||
|
@ -50,8 +49,7 @@ RootSignatureTokenizer::RootSignatureTokenizer(const char *pStr, size_t len)
|
||||||
}
|
}
|
||||||
|
|
||||||
RootSignatureTokenizer::RootSignatureTokenizer(const char *pStr)
|
RootSignatureTokenizer::RootSignatureTokenizer(const char *pStr)
|
||||||
: m_pOrigStr(pStr)
|
: m_pStrPos(pStr)
|
||||||
, m_pStrPos(pStr)
|
|
||||||
, m_pEndPos(pStr + strlen(pStr))
|
, m_pEndPos(pStr + strlen(pStr))
|
||||||
{
|
{
|
||||||
m_TokenBufferIdx = 0;
|
m_TokenBufferIdx = 0;
|
||||||
|
|
|
@ -193,7 +193,6 @@ public:
|
||||||
Token PeekToken();
|
Token PeekToken();
|
||||||
|
|
||||||
private:
|
private:
|
||||||
const char *m_pOrigStr;
|
|
||||||
const char *m_pStrPos;
|
const char *m_pStrPos;
|
||||||
const char *m_pEndPos;
|
const char *m_pEndPos;
|
||||||
|
|
||||||
|
|
|
@ -627,7 +627,6 @@ private:
|
||||||
DiagnosticsEngine &diags;
|
DiagnosticsEngine &diags;
|
||||||
|
|
||||||
TypeTranslator &typeTranslator;
|
TypeTranslator &typeTranslator;
|
||||||
FeatureManager &featureManager;
|
|
||||||
|
|
||||||
uint32_t entryFunctionId;
|
uint32_t entryFunctionId;
|
||||||
|
|
||||||
|
@ -745,7 +744,7 @@ DeclResultIdMapper::DeclResultIdMapper(const hlsl::ShaderModel &model,
|
||||||
const EmitSPIRVOptions &options)
|
const EmitSPIRVOptions &options)
|
||||||
: shaderModel(model), theBuilder(builder), spirvOptions(options),
|
: shaderModel(model), theBuilder(builder), spirvOptions(options),
|
||||||
astContext(context), diags(context.getDiagnostics()),
|
astContext(context), diags(context.getDiagnostics()),
|
||||||
typeTranslator(translator), featureManager(features), entryFunctionId(0),
|
typeTranslator(translator), entryFunctionId(0),
|
||||||
laneCountBuiltinId(0), laneIndexBuiltinId(0), needsLegalization(false),
|
laneCountBuiltinId(0), laneIndexBuiltinId(0), needsLegalization(false),
|
||||||
glPerVertex(model, context, builder, typeTranslator) {}
|
glPerVertex(model, context, builder, typeTranslator) {}
|
||||||
|
|
||||||
|
|
|
@ -62,7 +62,7 @@ inline bool hasGSPrimitiveTypeQualifier(const DeclaratorDecl *decl) {
|
||||||
GlPerVertex::GlPerVertex(const hlsl::ShaderModel &sm, ASTContext &context,
|
GlPerVertex::GlPerVertex(const hlsl::ShaderModel &sm, ASTContext &context,
|
||||||
ModuleBuilder &builder, TypeTranslator &translator)
|
ModuleBuilder &builder, TypeTranslator &translator)
|
||||||
: shaderModel(sm), astContext(context), theBuilder(builder),
|
: shaderModel(sm), astContext(context), theBuilder(builder),
|
||||||
typeTranslator(translator), inClipVar(0), inCullVar(0), outClipVar(0),
|
inClipVar(0), inCullVar(0), outClipVar(0),
|
||||||
outCullVar(0), inArraySize(0), outArraySize(0), inClipArraySize(1),
|
outCullVar(0), inArraySize(0), outArraySize(0), inClipArraySize(1),
|
||||||
outClipArraySize(1), inCullArraySize(1), outCullArraySize(1),
|
outClipArraySize(1), inCullArraySize(1), outCullArraySize(1),
|
||||||
inSemanticStrs(2, ""), outSemanticStrs(2, "") {}
|
inSemanticStrs(2, ""), outSemanticStrs(2, "") {}
|
||||||
|
|
|
@ -134,7 +134,6 @@ private:
|
||||||
const hlsl::ShaderModel &shaderModel;
|
const hlsl::ShaderModel &shaderModel;
|
||||||
ASTContext &astContext;
|
ASTContext &astContext;
|
||||||
ModuleBuilder &theBuilder;
|
ModuleBuilder &theBuilder;
|
||||||
TypeTranslator &typeTranslator;
|
|
||||||
|
|
||||||
/// Input/output ClipDistance/CullDistance variable.
|
/// Input/output ClipDistance/CullDistance variable.
|
||||||
uint32_t inClipVar, inCullVar;
|
uint32_t inClipVar, inCullVar;
|
||||||
|
|
|
@ -632,7 +632,6 @@ public:
|
||||||
|
|
||||||
IFT(CreateMemoryStream(m_pMalloc, &pOutputStream));
|
IFT(CreateMemoryStream(m_pMalloc, &pOutputStream));
|
||||||
|
|
||||||
const llvm::opt::OptTable *table = ::options::getHlslOptTable();
|
|
||||||
int argCountInt;
|
int argCountInt;
|
||||||
IFT(UIntToInt(argCount, &argCountInt));
|
IFT(UIntToInt(argCount, &argCountInt));
|
||||||
hlsl::options::MainArgs mainArgs(argCountInt, pArguments, 0);
|
hlsl::options::MainArgs mainArgs(argCountInt, pArguments, 0);
|
||||||
|
|
Загрузка…
Ссылка в новой задаче