summaryrefslogtreecommitdiffstatshomepage
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/mame/drivers/pcipc.cpp2
-rw-r--r--src/osd/modules/render/bgfx/shadermanager.cpp15
-rw-r--r--src/osd/modules/render/bgfx/shaders/shader.mk38
3 files changed, 40 insertions, 15 deletions
diff --git a/src/mame/drivers/pcipc.cpp b/src/mame/drivers/pcipc.cpp
index d9a751af7fe..290d3252989 100644
--- a/src/mame/drivers/pcipc.cpp
+++ b/src/mame/drivers/pcipc.cpp
@@ -193,7 +193,7 @@ WRITE8_MEMBER(pcipc_state::boot_state_w)
}
static MACHINE_CONFIG_START(pcipc, pcipc_state)
- MCFG_CPU_ADD("maincpu", PENTIUM, 66000000)
+ MCFG_CPU_ADD("maincpu", PENTIUM, 90000000)
MCFG_PCI_ROOT_ADD( ":pci")
MCFG_I82439HX_ADD( ":pci:00.0", ":maincpu", 256*1024*1024)
diff --git a/src/osd/modules/render/bgfx/shadermanager.cpp b/src/osd/modules/render/bgfx/shadermanager.cpp
index 8471b360549..6e683b9d14c 100644
--- a/src/osd/modules/render/bgfx/shadermanager.cpp
+++ b/src/osd/modules/render/bgfx/shadermanager.cpp
@@ -44,6 +44,7 @@ bgfx::ShaderHandle shader_manager::load_shader(std::string name)
std::string shader_path;
switch (bgfx::getRendererType())
{
+ case bgfx::RendererType::Noop:
case bgfx::RendererType::Direct3D9:
shader_path = m_options.bgfx_path() + std::string("/shaders/dx9/");
break;
@@ -53,16 +54,24 @@ bgfx::ShaderHandle shader_manager::load_shader(std::string name)
shader_path = m_options.bgfx_path() + std::string("/shaders/dx11/");
break;
- case bgfx::RendererType::OpenGL:
- shader_path = m_options.bgfx_path() + std::string("/shaders/glsl/");
+ case bgfx::RendererType::Gnm:
+ shader_path = m_options.bgfx_path() + std::string("/shaders/pssl/");
break;
case bgfx::RendererType::Metal:
shader_path = m_options.bgfx_path() + std::string("/shaders/metal/");
break;
+ case bgfx::RendererType::OpenGL:
+ shader_path = m_options.bgfx_path() + std::string("/shaders/glsl/");
+ break;
+
case bgfx::RendererType::OpenGLES:
- shader_path = m_options.bgfx_path() + std::string("/shaders/gles/");
+ shader_path = m_options.bgfx_path() + std::string("/shaders/essl/");
+ break;
+
+ case bgfx::RendererType::Vulkan:
+ shader_path = m_options.bgfx_path() + std::string("/shaders/spirv/");
break;
default:
diff --git a/src/osd/modules/render/bgfx/shaders/shader.mk b/src/osd/modules/render/bgfx/shaders/shader.mk
index 222730c824b..89c13a1b867 100644
--- a/src/osd/modules/render/bgfx/shaders/shader.mk
+++ b/src/osd/modules/render/bgfx/shaders/shader.mk
@@ -19,12 +19,14 @@ ifndef TARGET
.PHONY: all
all:
@echo Usage: make TARGET=# [clean, all, rebuild]
- @echo " TARGET=0 (hlsl - dx9)"
- @echo " TARGET=1 (hlsl - dx11)"
- @echo " TARGET=2 (glsl - nacl)"
- @echo " TARGET=3 (glsl - android)"
- @echo " TARGET=4 (glsl - linux)"
- @echo " TARGET=5 (metal - OSX/iOS)"
+ @echo " TARGET=0 (hlsl - d3d9)"
+ @echo " TARGET=1 (hlsl - d3d11)"
+ @echo " TARGET=2 (essl - nacl)"
+ @echo " TARGET=3 (essl - android)"
+ @echo " TARGET=4 (glsl)"
+ @echo " TARGET=5 (metal)"
+ @echo " TARGET=6 (pssl)"
+ @echo " TARGET=7 (spriv)"
@echo " VERBOSE=1 show build commands."
else
@@ -42,13 +44,13 @@ else
ifeq ($(TARGET), 2)
VS_FLAGS=--platform nacl
FS_FLAGS=--platform nacl
-SHADER_PATH=shaders/gles/$(SHADERS_DIR)
+SHADER_PATH=shaders/essl/$(SHADERS_DIR)
else
ifeq ($(TARGET), 3)
VS_FLAGS=--platform android
FS_FLAGS=--platform android
CS_FLAGS=--platform android
-SHADER_PATH=shaders/gles/$(SHADERS_DIR)
+SHADER_PATH=shaders/essl/$(SHADERS_DIR)
else
ifeq ($(TARGET), 4)
VS_FLAGS=--platform linux -p 120
@@ -61,6 +63,20 @@ VS_FLAGS=--platform osx -p metal
FS_FLAGS=--platform osx -p metal
CS_FLAGS=--platform osx -p metal
SHADER_PATH=shaders/metal/$(SHADERS_DIR)
+else
+ifeq ($(TARGET), 6)
+VS_FLAGS=--platform orbis -p pssl
+FS_FLAGS=--platform orbis -p pssl
+CS_FLAGS=--platform orbis -p pssl
+SHADER_PATH=shaders/pssl/$(SHADERS_DIR)
+else
+ifeq ($(TARGET), 7)
+VS_FLAGS=--platform linux -p spirv
+FS_FLAGS=--platform linux -p spirv
+CS_FLAGS=--platform linux -p spirv
+SHADER_PATH=shaders/spirv/$(SHADERS_DIR)
+endif
+endif
endif
endif
endif
@@ -109,17 +125,17 @@ endif
$(BUILD_INTERMEDIATE_DIR)/vs_%.bin : $(SHADERS_DIR)vs_%.sc
@echo [$(<)]
- $(SILENT) $(SHADERC) -f $(<) -o $(@) --type vertex $(VS_FLAGS) --depends --disasm
+ $(SILENT) $(SHADERC) $(VS_FLAGS) --type vertex --depends -o $(@) -f $(<) --disasm
$(SILENT) cp $(@) $(BUILD_OUTPUT_DIR)/$(@F)
$(BUILD_INTERMEDIATE_DIR)/fs_%.bin : $(SHADERS_DIR)fs_%.sc
@echo [$(<)]
- $(SILENT) $(SHADERC) -f $(<) -o $(@) --type fragment $(FS_FLAGS) --depends --disasm
+ $(SILENT) $(SHADERC) $(FS_FLAGS) --type fragment --depends -o $(@) -f $(<) --disasm
$(SILENT) cp $(@) $(BUILD_OUTPUT_DIR)/$(@F)
$(BUILD_INTERMEDIATE_DIR)/cs_%.bin : $(SHADERS_DIR)cs_%.sc
@echo [$(<)]
- $(SILENT) $(SHADERC) -f $(<) -o $(@) --type compute $(CS_FLAGS) --depends --disasm
+ $(SILENT) $(SHADERC) $(CS_FLAGS) --type compute --depends -o $(@) -f $(<) --disasm
$(SILENT) cp $(@) $(BUILD_OUTPUT_DIR)/$(@F)
.PHONY: all