Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fixed bug: (win32) PCSXR Window always start at 0, 0 #19

Open
wants to merge 110 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
110 commits
Select commit Hold shift + click to select a range
106f659
Update to VS 2015
iCatButler Mar 22, 2016
7767ea4
Initial upload of PGXP.
iCatButler Mar 25, 2016
b1f5a6c
- Move pgxp_gpu source files into correct folder.
iCatButler Mar 26, 2016
e3df273
- Fix memory addresses as each mirrored address range is further mirr…
iCatButler Mar 28, 2016
8b4350f
Bring up to date with PCSX-R master (97809)
iCatButler Mar 30, 2016
61a6f15
Prevent crash on negative length patch
iCatButler Mar 30, 2016
f7f38c4
This Son of Ugly's Wipeout patch
iCatButler Mar 30, 2016
0c06f5e
Fix default definition of pgxpMemory call.
iCatButler Mar 30, 2016
3c0cd06
Revert "Son of Ugly's Wipeout patch"
iCatButler Mar 31, 2016
f671d25
Added:
Nucleoprotein Mar 31, 2016
f84c690
Merge pull request #1 from tapcio/master
iCatButler Apr 1, 2016
580df75
Fix load state bug
iCatButler Apr 1, 2016
153c8eb
Perspective correct texturing
iCatButler Apr 27, 2016
216c2ff
Fix bugs from previous
iCatButler May 2, 2016
4b70684
Ensure w is reset to 1.f to prevent stale values.
iCatButler May 3, 2016
ca61b53
More fixes for persective correct build
iCatButler May 6, 2016
cd126bc
Revert pcsxr@87829
iCatButler May 8, 2016
1a30cfb
Integrate SonofUgly's overclocking mechanism
iCatButler May 8, 2016
b5a7387
Add PGXP visual debug mode
iCatButler May 10, 2016
ee328ce
Fix build on OSX
CarterLi May 12, 2016
a943b8e
Merge pull request #2 from CarterLi/master
iCatButler May 13, 2016
6a9f878
Define and initialise PsxClockSpeed
iCatButler May 15, 2016
fed5120
Track memory read and writes with constant addresses
iCatButler May 15, 2016
2a24b74
Implement vertex caching
iCatButler May 15, 2016
1e37eec
Merge with OSX commit
iCatButler May 15, 2016
a64d62b
Add PGXP configuration dialog
iCatButler May 16, 2016
b51d96c
Fix screen smoothing
iCatButler May 31, 2016
7ecfee1
Add checkbox for per-game memory cards
iCatButler May 31, 2016
f700823
Initial PGXP CPU commit
iCatButler Jun 7, 2016
cfa7b3a
CPU op fixes
iCatButler Jun 11, 2016
4217620
Imporved CPU integration
iCatButler Jun 27, 2016
6b78a14
Disable debug mode
iCatButler Jun 29, 2016
485432c
Initialise GTE and CPU regsiters (invalidate)
iCatButler Jun 30, 2016
e634f60
Fix interpreter bugs
iCatButler Jun 30, 2016
03cfe9e
Additional checks
iCatButler Jul 2, 2016
97105b2
Change "valid" flag to multiple bit flags
iCatButler Jul 4, 2016
d5b40fb
Use overclock on load state
iCatButler Jul 30, 2016
69f33a4
Various CPU updates
iCatButler Jul 30, 2016
aafb74a
Fix NCLIP related crash
iCatButler Aug 1, 2016
5950347
Fix possible function pointer initialisation problem
iCatButler Aug 3, 2016
36ef727
Add PGXP support to 64bit dynarec
iCatButler Aug 5, 2016
9c8d8a5
Fix OSX build
CarterLi Jun 12, 2016
aa50163
Merge pull request #3 from CarterLi/master
iCatButler Aug 5, 2016
b9ca947
Fix some edge cases and imprve depth visualisation:
iCatButler Sep 1, 2016
3242722
Fix Xcode build issues
chrisballinger Oct 25, 2016
d7a3136
Add support for arbitrary clock multipliers
iCatButler Mar 17, 2017
53a4511
Add support for new visualisations
iCatButler Mar 17, 2017
685e040
Fix false positive when rendering transparent objects in wireframe
iCatButler Mar 19, 2017
b9ba001
Fix issue with flat shaded primitives in colour only mode
iCatButler Mar 19, 2017
5dbb8dd
Add texture only visualisation
iCatButler Mar 24, 2017
496df34
Prevent incomplete vertices using precise NCLIP
iCatButler Apr 25, 2017
36c126b
Add OSX files to gitignore
Jun 27, 2017
72b90e1
Fix OSX debug build
Jun 27, 2017
6b5b17b
Fix PGXP support in 64bit dynarec on OSX/Linux
Jun 27, 2017
043615f
Fix PeopsXgl exports on OSX
Jun 29, 2017
952b598
Add PGXP preferences UI for OS X
Jun 30, 2017
f38cec6
Add CPU Overclocking to preferences UI on OS X
Jul 1, 2017
afe8c4a
Various fixes to PeopsOpenGL preferences UI on OSX
Jul 7, 2017
d880179
Fix compilation on linux.
loathingKernel Jul 10, 2017
8f19dd4
Bring cdriso.c up to date to enable CCDDA
loathingKernel Jul 10, 2017
9f2574f
* Move data and pixmaps folders inside gui folder to reflect codeplex…
loathingKernel Jul 16, 2017
aa295fe
* Bring main Linux(gtk) UI up to date to remove deprecated warnings.
loathingKernel Jul 17, 2017
a96eefd
* Bring pluing Linux(gtk) interfaces up to date.
loathingKernel Jul 17, 2017
7a43668
* Add nullsio1 plugin from upstream
loathingKernel Jul 17, 2017
f48b5b2
* Add configuration UI for PGXP.
loathingKernel Jul 17, 2017
95a7aec
* Add UI configuration knobs from overclocking, wipeout memhack and p…
loathingKernel Jul 18, 2017
966a413
* Optimized pixmaps to reduce size
loathingKernel Jul 18, 2017
b612914
* Add setting to disable physical gamepad vibration.
loathingKernel Jul 18, 2017
db51fad
* dfinput: Fix possible buffer overflows in the ui.
loathingKernel Jul 20, 2017
b117a70
* Plugin.c: Add PGXP visual debug binding (F11)
loathingKernel Jul 28, 2017
dcf718b
* Revert parts of the per game memory card patch.
loathingKernel Jul 30, 2017
01f4990
* Sync with codeplex branch (libpcsxcore, linux gui)
loathingKernel Jul 31, 2017
3912ad3
* Import CMake build system from codeplex
loathingKernel Jul 31, 2017
a93c5c5
* Fix CMake to include PGXP sources. Import updated translations.
loathingKernel Jul 31, 2017
ed3dc69
* Don't build PIE executables
loathingKernel Jul 31, 2017
7b0c850
Merge branch 'fix-linux-build' into sync-with-codeplex
loathingKernel Jul 31, 2017
12b29ff
Create .travis.yml
loathingKernel Oct 6, 2017
967dcac
* win32
loathingKernel Oct 9, 2017
b22f323
* Add appveyor.yml
loathingKernel Oct 9, 2017
734ec12
* Add needed m4 macros to keep ubuntu bullshit happy
loathingKernel Oct 9, 2017
75fff89
* Hopefully travis will be happy now and start make
loathingKernel Oct 9, 2017
b7e4723
* Add gnu99 compiler directive, make build compatible with earlier au…
loathingKernel Oct 9, 2017
e88054e
* Travis won't work because of libgtk requirements
loathingKernel Oct 11, 2017
1ba9d54
* Zip artifacts
loathingKernel Oct 12, 2017
128d6af
* Remove autotools build system.
loathingKernel Jan 12, 2018
540dccf
Merge pull request #4 from chrisballinger/macos-fixes
iCatButler Mar 13, 2018
13c17e4
Merge branch 'master' into master
iCatButler Mar 13, 2018
15fe378
Merge pull request #5 from MrLavender/master
iCatButler Mar 13, 2018
2d0b10f
Merge branch 'master' into fix-linux-build
iCatButler Mar 13, 2018
7683324
Merge pull request #6 from loathingKernel/fix-linux-build
iCatButler Mar 13, 2018
6f76041
Merge pull request #7 from loathingKernel/sync-with-codeplex
iCatButler Mar 19, 2018
692119c
* CMake messages
loathingKernel Jan 18, 2018
4898138
* Use no-pie for clang too.
loathingKernel Jan 29, 2018
e11f002
* Fix file and folder permissions
loathingKernel Feb 1, 2018
7716dc6
* Add Travis CI for Linux (through docker) and OS X
loathingKernel Mar 22, 2018
a1f75bb
* Remove unneeded mcd argument on macosx
loathingKernel Mar 22, 2018
5687e96
* Use separate dockerfiles for gcc and clang
loathingKernel Mar 22, 2018
7936d46
Merge pull request #8 from loathingKernel/travis
iCatButler Apr 27, 2018
11dc4ba
Fix various GCC warnings on peopsxgl plugin
jlHertel Aug 16, 2018
808e3fe
Fix missing background Image
iCatButler Nov 10, 2018
cd685f7
Port various fixes from Beetle renderers
iCatButler Dec 16, 2018
7ce3857
Merge pull request #9 from jlHertel/master
iCatButler Dec 18, 2018
9132085
Add Line Hack Mode selection box for Linux UI
loathingKernel Dec 24, 2018
eac8516
Disable autoselect for PPC dynarec since it's broken
Mystro256 Feb 13, 2019
d7a90b4
Add support for GL Extensions to Windows GPU plugin
iCatButler Mar 2, 2019
58f5d82
Merge branch 'master' of https://github.com/iCatButler/pcsxr.git
iCatButler Mar 2, 2019
5a6d59e
Merge pull request #10 from loathingKernel/master
iCatButler Mar 6, 2019
62467b8
Merge pull request #11 from Mystro256/master
iCatButler Mar 6, 2019
f171ceb
Fix PCSXR window that always start at 0, 0
SiraitX May 9, 2020
f10b4dd
PGXP as default setting
SiraitX May 18, 2020
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
20 changes: 20 additions & 0 deletions .appveyor.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
version: 1.9.95.{branch}.{build}

pull_requests:
do_not_increment_build_number: true

configuration:
- Debug
- Release

build:
project: win32/pcsxr.sln
verbosity: minimal

after_build:
- cd win32\build\%CONFIGURATION%
- 7z a pcsxr-pgxp.zip pcsxr-pgxp.exe
- 7z a pcsxr-pgxp.zip plugins\*.dll

artifacts:
- path: win32\build\%CONFIGURATION%\pcsxr-pgxp.zip
14 changes: 14 additions & 0 deletions .gitattributes
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
* text=auto
*.h text=auto
*.c text=auto
*.cpp text=auto
*.m text=lf
*.swift text=lf
*.rc text=crlf

*.pdf binary
*.gif binary
*.jpg binary
*.png binary
*.bmp binary
*.ico binary
15 changes: 15 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
################################################################################
# This .gitignore file was automatically created by Microsoft(R) Visual Studio.
################################################################################

/SyncToy_b769e033-01a5-40b2-9c12-6b3a0fbe40a4.dat
macosx/build
xcuserdata
macosx/Info.plistvers.plist
*.kdev4
linux_build.sh
project.xcworkspace
.DS_Store
build/
*.suo
*.VC.db
29 changes: 29 additions & 0 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,29 @@
matrix:
include:
- os: linux
language: c
sudo: required
compiler: gcc
services: docker
before_install:
- docker pull ubuntu:17.10
script:
- docker build -f Dockerfile.gcc .
- os: linux
language: c
sudo: required
compiler: clang
services: docker
before_install:
- docker pull ubuntu:17.10
script:
- docker build -f Dockerfile.clang .
- os: osx
osx_image: xcode7.3
before_install:
- curl -O -L https://www.libsdl.org/release/SDL2-2.0.8.dmg
- hdiutil attach SDL2-2.0.8.dmg
- sudo cp -a /Volumes/SDL2/SDL2.framework /Library/Frameworks/
language: objective-c
xcode_project: macosx/Pcsxr.xcodeproj
xcode_scheme: PCSXR
1 change: 1 addition & 0 deletions AUTHORS
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@ PCSX-Reloaded Authors/Contributors: avlex (Help on xcode project)
edgbla (Root counters, SIO1, various core/plugin fixes)
Firnis (GTE code from PCSX-Revolution Project)
Hopkat (Sound plugin improvements, core fixes)
iSage (compressed CD-DA, migration to CMake)
Gabriele Gorla (MDEC decoder)
MaddTheSane (Various bugfixes)
maggix (Snow Leopard compile fix)
Expand Down
56 changes: 56 additions & 0 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,56 @@
cmake_minimum_required(VERSION 3.4.0)
cmake_policy(SET CMP0065 NEW)

list(APPEND CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${CMAKE_SOURCE_DIR}/cmake)
list(APPEND CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${CMAKE_SOURCE_DIR}/cmake/macros)

set(CMAKE_BUILD_TYPE "Release" CACHE STRING "Choose the type of build")
set_property(CACHE CMAKE_BUILD_TYPE PROPERTY STRINGS Debug Release RelWithDebInfo MinSizeRel)

project(pcsxr)

set(PCSXR_VERSION_MAJOR "1")
set(PCSXR_VERSION_MINOR "9")
set(PCSXR_VERSION_PATCH "94")
add_definitions(-DPACKAGE_VERSION="${PCSXR_VERSION_MAJOR}.${PCSXR_VERSION_MINOR}.${PCSXR_VERSION_PATCH}")
add_definitions(-DPACKAGE_NAME="PCSXr")
add_definitions(-DPACKAGE_STRING="PCSXr ${PCSXR_VERSION_MAJOR}.${PCSXR_VERSION_MINOR}.${PCSXR_VERSION_PATCH}")
set(CMAKE_C_FLAGS_RELEASE "${CMAKE_C_FLAGS_RELEASE} -s")
set(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} -s")

include(CheckCCompilerFlag)
include(GNUInstallDirs)

include_directories(${CMAKE_SOURCE_DIR})

add_definitions(-DENABLE_NLS -DGETTEXT_PACKAGE="pcsxr")

#WARNING! this is required for dynarec to work!
set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -fno-pie")
list(APPEND COMPILER_IDS "GNU" "Clang")
if(CMAKE_C_COMPILER_ID IN_LIST COMPILER_IDS)
CHECK_C_COMPILER_FLAG("-no-pie" NO_PIE_UPSTREAM)
if(NO_PIE_UPSTREAM)
set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -no-pie")
endif()
CHECK_C_COMPILER_FLAG("-nopie" NO_PIE_PATCHED)
if(NO_PIE_PATCHED)
set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -nopie")
endif()
endif()

option(BUILD_SIO1 "Build SIO1 plugin." ON)
option(BUILD_OPENGL "Build OpenGL plugin." ON)

if (BUILD_SIO1)
add_definitions(-DENABLE_SIO1API)
endif()

#components
add_subdirectory(libpcsxcore)
add_subdirectory(gui)
add_subdirectory(plugins)
add_subdirectory(doc)



Empty file modified ChangeLog
100755 → 100644
Empty file.
12 changes: 12 additions & 0 deletions Dockerfile.clang
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
FROM ubuntu:17.10

RUN apt-get update -qq
RUN apt-get install -qq -y libtool intltool clang automake autoconf cmake
RUN apt-get install -qq -y libavformat-dev libavcodec-dev libavutil-dev libgtk-3-dev libsdl2-dev libxtst-dev libxml2-utils libxml2-dev libarchive-dev libcdio-dev

RUN mkdir -p /src/build/
WORKDIR /src/build/

COPY . /src/
RUN cmake .. -DCMAKE_C_COMPILER='clang' -DCMAKE_CXX_COMPILER='clang++' -DCMAKE_BUILD_TYPE='Release' -DCMAKE_INSTALL_PREFIX='/usr' -DCMAKE_INSTALL_LIBDIR='/usr/lib' -DSND_BACKEND='sdl' -DENABLE_CCDDA='ON' -DUSE_LIBARCHIVE='ON' -DUSE_LIBCDIO='ON'
RUN make
12 changes: 12 additions & 0 deletions Dockerfile.gcc
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
FROM ubuntu:17.10

RUN apt-get update -qq
RUN apt-get install -qq -y libtool intltool gcc automake autoconf cmake
RUN apt-get install -qq -y libavformat-dev libavcodec-dev libavutil-dev libgtk-3-dev libsdl2-dev libxtst-dev libxml2-utils libxml2-dev libarchive-dev libcdio-dev

RUN mkdir -p /src/build/
WORKDIR /src/build/

COPY . /src/
RUN cmake .. -DCMAKE_C_COMPILER='gcc' -DCMAKE_CXX_COMPILER='g++' -DCMAKE_BUILD_TYPE='Release' -DCMAKE_INSTALL_PREFIX='/usr' -DCMAKE_INSTALL_LIBDIR='/usr/lib' -DSND_BACKEND='sdl' -DENABLE_CCDDA='ON' -DUSE_LIBARCHIVE='ON' -DUSE_LIBCDIO='ON'
RUN make
Loading