[mupen64plus-video-arachnoid] 95/147: Imported Upstream version 1.99.5
Sven Eckelmann
ecsv-guest at moszumanska.debian.org
Thu Nov 26 06:09:53 UTC 2015
This is an automated email from the git hooks/post-receive script.
ecsv-guest pushed a commit to branch master
in repository mupen64plus-video-arachnoid.
commit 8991918599a65d2beef0efa9f3495d4f78d09693
Author: Sven Eckelmann <sven at narfation.org>
Date: Wed Oct 10 16:37:21 2012 +0200
Imported Upstream version 1.99.5
---
.hg_archival.txt | 5 ++
.hgignore | 4 ++
.hgtags | 2 +
projects/msvc9/GraphicsPlugin.vcproj | 4 +-
projects/unix/Makefile | 13 +++--
src/GraphicsPlugin.cpp | 96 +-----------------------------------
src/OpenGLManager.h | 1 -
src/main.cpp | 2 +-
src/texture/ImageFormatSelector.cpp | 1 -
9 files changed, 23 insertions(+), 105 deletions(-)
diff --git a/.hg_archival.txt b/.hg_archival.txt
new file mode 100644
index 0000000..3d52b06
--- /dev/null
+++ b/.hg_archival.txt
@@ -0,0 +1,5 @@
+repo: 976896f303442924a04de6fb0725b98269a9bbe3
+node: fdf691ffdedadb6605aab235cd4c593bcb9977f8
+branch: default
+latesttag: 1.99.5
+latesttagdistance: 1
diff --git a/.hgignore b/.hgignore
new file mode 100644
index 0000000..8f52e27
--- /dev/null
+++ b/.hgignore
@@ -0,0 +1,4 @@
+syntax: regexp
+
+^projects/unix/_obj/
+^projects/unix/mupen64plus-video-arachnoid.so$
diff --git a/.hgtags b/.hgtags
new file mode 100644
index 0000000..77abdaf
--- /dev/null
+++ b/.hgtags
@@ -0,0 +1,2 @@
+7713c313dc69e551761636645e9ad94d2e3a93c6 1.99.4
+567e98c190507a3818bf851ecb2b5de600de7896 1.99.5
diff --git a/projects/msvc9/GraphicsPlugin.vcproj b/projects/msvc9/GraphicsPlugin.vcproj
index ef34ea6..72aa484 100755
--- a/projects/msvc9/GraphicsPlugin.vcproj
+++ b/projects/msvc9/GraphicsPlugin.vcproj
@@ -64,7 +64,7 @@
/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="opengl32.lib glu32.lib"
+ AdditionalDependencies="opengl32.lib"
OutputFile="mupen64plus-video-arachnoid.dll"
LinkIncremental="2"
GenerateDebugInformation="true"
@@ -143,7 +143,7 @@
/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="opengl32.lib glu32.lib"
+ AdditionalDependencies="opengl32.lib"
OutputFile="mupen64plus-video-arachnoid.dll"
LinkIncremental="1"
GenerateDebugInformation="true"
diff --git a/projects/unix/Makefile b/projects/unix/Makefile
index ade6a5d..d6f73a1 100755
--- a/projects/unix/Makefile
+++ b/projects/unix/Makefile
@@ -120,12 +120,9 @@ else
ifeq ($(shell pkg-config --modversion gl 2>/dev/null),)
$(error No OpenGL development libraries found!)
endif
- ifeq ($(shell pkg-config --modversion glu 2>/dev/null),)
- $(error No OpenGL utility development libraries found!)
- endif
- CFLAGS += -pthread $(shell pkg-config --cflags gl glu)
- LDLIBS += -pthread $(shell pkg-config --libs gl glu)
+ CFLAGS += -pthread $(shell pkg-config --cflags gl)
+ LDLIBS += -pthread $(shell pkg-config --libs gl)
endif
ifeq ($(OS), LINUX)
LDLIBS += -ldl
@@ -317,6 +314,7 @@ targets:
@echo " DESTDIR=path == path to prepend to all installation paths (only for packagers)"
@echo " Debugging Options:"
@echo " DEBUG=1 == add debugging symbols"
+ @echo " LTO=1 == enable experimental build with link-time optimization"
@echo " V=1 == show verbose compiler output"
all: $(TARGET)
@@ -337,6 +335,11 @@ CFLAGS += -MD
-include $(OBJECTS:.o=.d)
CXXFLAGS += $(CFLAGS)
+ifeq ($(LTO), 1)
+ CFLAGS += -flto
+ CXXFLAGS += -flto
+ LDFLAGS += -fuse-linker-plugin $(CXXFLAGS)
+endif
# standard build rules
$(OBJDIR)/%.o: $(SRCDIR)/%.c
diff --git a/src/GraphicsPlugin.cpp b/src/GraphicsPlugin.cpp
index 1afc14e..959c8f4 100755
--- a/src/GraphicsPlugin.cpp
+++ b/src/GraphicsPlugin.cpp
@@ -309,89 +309,6 @@ void renderRedBox(float x, float y, float z, float width, float height, float l
glEnd();
}
-void GraphicsPlugin::_motionBlur()
-{
- glMatrixMode(GL_PROJECTION);
- glLoadIdentity();
- gluPerspective(45.0f,(GLfloat)800.0f/(GLfloat)600.0f, .5f ,150.0f);
-
- glMatrixMode(GL_MODELVIEW);
- glLoadIdentity();
- gluLookAt(0, 0, 10, 0, 0, 0, 0, 1, 0);
-
- ////Render new stuff to the motion blur texture
- if ( animate(50) )
- {
- //Render to frame buffer
-// framebuffer01.beginRendering();
- {
- renderMotionBlur();
-
- glMatrixMode(GL_PROJECTION);
- glLoadIdentity();
- gluPerspective(45.0f,(GLfloat)800.0f/(GLfloat)600.0f, .5f ,150.0f);
-
- glMatrixMode(GL_MODELVIEW);
- glLoadIdentity();
- gluLookAt(0, 0, 10, 0, 0, 0, 0, 1, 0);
-
- renderRedBox(0, 0, 0, 1, 5, 1);
- //m_displayListParser->processDisplayList();
-
-
- }
- glFlush();
- // framebuffer01.endRendering();
- glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT);
- }
-
- //glDisable(GL_BLEND);
- //glEnable(GL_DEPTH_TEST);
-
- //renderMotionBlur();
- //renderTriangle();
-
- renderMotionBlur();
-
- // glMatrixMode(GL_PROJECTION);
- //glLoadIdentity();
- //gluPerspective(45.0f,(GLfloat)800.0f/(GLfloat)600.0f, .5f ,150.0f);
-
- // glMatrixMode(GL_MODELVIEW);
- // glLoadIdentity();
- //gluLookAt(0, 0, 10, 0, 0, 0, 0, 1, 0);
-
- //renderRedBox(0, 0, 0, 1, 5, 1);
-
- m_rdp.triggerInterrupt();
- m_rsp.triggerInterrupt();
-
-
- //Render new stuff to frame buffer
- //framebuffer02.beginRendering();
- {
- // m_displayListParser->processDisplayList();
- // RSP::getSingleton().reset();
- // RDP::getSingleton().reset();
-
- // glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT);
- // glDisable(GL_BLEND);
- // glEnable(GL_DEPTH_TEST);
- // glDisable(GL_ALPHA_TEST);
- //m_displayListParser->processDisplayList();
- }
- //glFlush();
- //framebuffer02.endRendering();
- //glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT);
-
- //Blend old stuff and new stuff
-
- //framebuffer02.render2();
-
- //FrameBuffer::getSingleton().render();
-
-}
-
//-----------------------------------------------------------------------------
// ProcessDisplayList
//-----------------------------------------------------------------------------
@@ -448,18 +365,7 @@ void GraphicsPlugin::processDisplayList()
m_rsp.reset();
m_rdp.reset();
m_openGLMgr.setCullMode(false, true);
-
-
- if ( false )
- {
- _motionBlur();
- }
- else
- {
- m_displayListParser->processDisplayList();
-
- }
-
+ m_displayListParser->processDisplayList();
}
//Clear Screen?
diff --git a/src/OpenGLManager.h b/src/OpenGLManager.h
index 380a8c3..3359cf2 100755
--- a/src/OpenGLManager.h
+++ b/src/OpenGLManager.h
@@ -26,7 +26,6 @@
//OpenGL includes
#include "m64p.h"
#include "OpenGL.h"
-#include <GL/glu.h>
//*****************************************************************************
//* OpenGL Manager Class
diff --git a/src/main.cpp b/src/main.cpp
index 8962663..a09929d 100755
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -38,7 +38,7 @@
//Definitions
#define PLUGIN_NAME "Arachnoid Video Plugin"
-#define PLUGIN_VERSION 0x016304
+#define PLUGIN_VERSION 0x016305
#define VIDEO_PLUGIN_API_VERSION 0x020100
#define CONFIG_API_VERSION 0x020000
#define VIDEXT_API_VERSION 0x020000
diff --git a/src/texture/ImageFormatSelector.cpp b/src/texture/ImageFormatSelector.cpp
index 716368e..8d70596 100755
--- a/src/texture/ImageFormatSelector.cpp
+++ b/src/texture/ImageFormatSelector.cpp
@@ -32,7 +32,6 @@
#include "GBIDefs.h"
#include "m64p.h"
#include "OpenGL.h"
-#include <GL/glu.h>
#include "Memory.h"
#ifndef GL_EXT_packed_pixels
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-games/mupen64plus-video-arachnoid.git
More information about the Pkg-games-commits
mailing list