Commit 8cea3528 authored by Laszlo Agocs's avatar Laszlo Agocs

shadertools: Make QSpirv* private

parent 620e8e97
TEMPLATE = subdirs
SUBDIRS += \
rhi \
shadertools
rhi
......@@ -45,6 +45,21 @@ QT_BEGIN_NAMESPACE
\inmodule QtShaderTools
*/
/*!
\class QBakedShader::ShaderSourceVersion
\inmodule QtShaderTools
*/
/*!
\class QBakedShader::ShaderKey
\inmodule QtShaderTools
*/
/*!
\class QBakedShader::Shader
\inmodule QtShaderTools
*/
static const int QSB_VERSION = 1;
QBakedShader::QBakedShader()
......
......@@ -35,8 +35,8 @@
****************************************************************************/
#include "qshaderbaker.h"
#include "qspirvcompiler.h"
#include "qspirvshader.h"
#include "qspirvcompiler_p.h"
#include "qspirvshader_p.h"
#include <QFileInfo>
#include <QFile>
#include <QDebug>
......
......@@ -46,6 +46,26 @@ QT_BEGIN_NAMESPACE
\inmodule QtShaderTools
*/
/*!
\class QShaderDescription::InOutVariable
\inmodule QtShaderTools
*/
/*!
\class QShaderDescription::BlockVariable
\inmodule QtShaderTools
*/
/*!
\class QShaderDescription::UniformBlock
\inmodule QtShaderTools
*/
/*!
\class QShaderDescription::PushConstantBlock
\inmodule QtShaderTools
*/
QShaderDescription::QShaderDescription()
: d(new QShaderDescriptionPrivate)
{
......
......@@ -34,7 +34,7 @@
**
****************************************************************************/
#include "qspirvcompiler.h"
#include "qspirvcompiler_p.h"
#include "qshaderbatchablerewriter_p.h"
#include <QFile>
#include <QFileInfo>
......
......@@ -34,10 +34,21 @@
**
****************************************************************************/
#ifndef QSPIRVCOMPILER_H
#define QSPIRVCOMPILER_H
#ifndef QSPIRVCOMPILER_P_H
#define QSPIRVCOMPILER_P_H
#include <QtShaderTools/qtshadertoolsglobal.h>
//
// W A R N I N G
// -------------
//
// This file is not part of the Qt API. It exists for the convenience
// of a number of Qt sources files. This header file may change from
// version to version without notice, or even be removed.
//
// We mean it.
//
#include <QtShaderTools/private/qtshadertoolsglobal_p.h>
#include <QtShaderTools/qbakedshader.h>
#include <QtCore/QString>
......@@ -46,7 +57,7 @@ QT_BEGIN_NAMESPACE
struct QSpirvCompilerPrivate;
class QIODevice;
class Q_SHADERTOOLS_EXPORT QSpirvCompiler
class Q_SHADERTOOLS_PRIVATE_EXPORT QSpirvCompiler
{
public:
QSpirvCompiler();
......
......@@ -34,7 +34,7 @@
**
****************************************************************************/
#include "qspirvshader.h"
#include "qspirvshader_p.h"
#include "qshaderdescription_p.h"
#include <QFile>
#include <QDebug>
......
......@@ -34,10 +34,21 @@
**
****************************************************************************/
#ifndef QSPIRVSHADER_H
#define QSPIRVSHADER_H
#include <QtShaderTools/qtshadertoolsglobal.h>
#ifndef QSPIRVSHADER_P_H
#define QSPIRVSHADER_P_H
//
// W A R N I N G
// -------------
//
// This file is not part of the Qt API. It exists for the convenience
// of a number of Qt sources files. This header file may change from
// version to version without notice, or even be removed.
//
// We mean it.
//
#include <QtShaderTools/private/qtshadertoolsglobal_p.h>
#include <QtShaderTools/qshaderdescription.h>
QT_BEGIN_NAMESPACE
......@@ -45,7 +56,7 @@ QT_BEGIN_NAMESPACE
class QIODevice;
struct QSpirvShaderPrivate;
class Q_SHADERTOOLS_EXPORT QSpirvShader
class Q_SHADERTOOLS_PRIVATE_EXPORT QSpirvShader
{
public:
enum GlslFlag {
......
/****************************************************************************
**
** Copyright (C) 2018 The Qt Company Ltd.
** Contact: http://www.qt.io/licensing/
**
** This file is part of the Qt Shader Tools module
**
** $QT_BEGIN_LICENSE:GPL$
** Commercial License Usage
** Licensees holding valid commercial Qt licenses may use this file in
** accordance with the commercial license agreement provided with the
** Software or, alternatively, in accordance with the terms contained in
** a written agreement between you and The Qt Company. For licensing terms
** and conditions see https://www.qt.io/terms-conditions. For further
** information use the contact form at https://www.qt.io/contact-us.
**
** GNU General Public License Usage
** Alternatively, this file may be used under the terms of the GNU
** General Public License version 3 or (at your option) any later version
** approved by the KDE Free Qt Foundation. The licenses are as published by
** the Free Software Foundation and appearing in the file LICENSE.GPL3
** included in the packaging of this file. Please review the following
** information to ensure the GNU General Public License requirements will
** be met: https://www.gnu.org/licenses/gpl-3.0.html.
**
** $QT_END_LICENSE$
**
****************************************************************************/
#ifndef QTSHADERTOOLSGLOBAL_P_H
#define QTSHADERTOOLSGLOBAL_P_H
//
// W A R N I N G
// -------------
//
// This file is not part of the Qt API. It exists purely as an
// implementation detail. This header file may change from version to
// version without notice, or even be removed.
//
// We mean it.
//
#include "qtshadertoolsglobal.h"
#define Q_SHADERTOOLS_PRIVATE_EXPORT Q_SHADERTOOLS_EXPORT
#endif
......@@ -9,8 +9,8 @@ HEADERS += \
$$PWD/qbakedshader.h \
$$PWD/qbakedshader_p.h \
$$PWD/qshaderbaker.h \
$$PWD/qspirvshader.h \
$$PWD/qspirvcompiler.h \
$$PWD/qspirvshader_p.h \
$$PWD/qspirvcompiler_p.h \
$$PWD/qshaderbatchablerewriter_p.h
SOURCES += \
......
......@@ -61,8 +61,8 @@
// that uses the SPIR-V binary.
#include <QGuiApplication>
#include <QSpirvCompiler>
#include <QSpirvShader>
#include <private/qspirvcompiler_p.h>
#include <private/qspirvshader_p.h>
#include <QDebug>
#include <QOpenGLContext>
#include "renderwindow.h"
......
......@@ -54,7 +54,7 @@
#include <QOpenGLContext>
#include <QOpenGLShaderProgram>
#include <QOpenGLExtraFunctions>
#include <QSpirvShader>
#include <private/qspirvshader_p.h>
RenderWindow::RenderWindow(const QSpirvShader &vs, const QSpirvShader &fs, const QSurfaceFormat &format)
: m_context(0),
......
......@@ -52,8 +52,8 @@
#include <QtCore/qcommandlineparser.h>
#include <QtCore/qfileinfo.h>
#include <QtCore/qdebug.h>
#include <QtShaderTools/qspirvshader.h>
#include <QtShaderTools/qspirvcompiler.h>
#include <private/qspirvshader_p.h>
#include <private/qspirvcompiler_p.h>
static bool writeToFile(const QByteArray &buf, const QString &filename, bool text = false)
{
......
TEMPLATE = app
QT += shadertools
QT += shadertools-private
CONFIG += console
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment