Commit Graph

1826 Commits

Author SHA1 Message Date
gibbed 1bdb36eaa8 Added UploadTexture2D and UploadTextureCube to the profiler. 2015-05-13 22:02:16 -05:00
Ben Vanik 00b79d66ff Fixing sub carry flag. 2015-05-13 18:04:33 -07:00
gibbed b819c992ed CR0 tests for add. 2015-05-13 17:07:29 -05:00
gibbed bb947c6819 Value::MulHi and constant propagation for OPCODE_MUL_HI. Could maybe be reworked? 2015-05-13 16:13:06 -05:00
gibbed 9714018fbb Constant tests for srw, stvew, stvl, stvr, subf, subfc, subfe, subfic, subfme, subfze. 2015-05-13 06:38:31 -05:00
gibbed 0cf3e8c3f5 Simplify some register setup in the cntlzd and cntlzw tests. 2015-05-13 06:36:00 -05:00
gibbed 96e549d301 Constant tests for rldicr, rlwimi, rlwinm, rlwnm, sld, slw, srad, sradi, sraw, srawi, srd. 2015-05-13 03:14:06 -05:00
gibbed 5ebd4984ba Constant tests for mulhdu, mulhw, mulhwu, mulld, mulli, mullw, neg, nor, ori, rldicl. 2015-05-13 02:39:09 -05:00
Ben Vanik 6aec2c0d02 Whoops. I'm tired. 2015-05-13 00:38:55 -07:00
Ben Vanik 3b2035a054 Adding case for ObReferenceObjectByHandle, but impl still todo. 2015-05-13 00:37:35 -07:00
Ben Vanik 0d3e79ad2c Supporting const src1 mul_hi. 2015-05-13 00:19:07 -07:00
Ben Vanik 6fd7e35deb Fixing subfme. 2015-05-13 00:15:42 -07:00
gibbed 3ba6598caf Constant tests for eqv, lvexx, lvl, lvr, lssl, lvsr, mulhd. 2015-05-13 01:53:07 -05:00
Ben Vanik 4248268b4f Fixing divd constant. 2015-05-12 23:38:02 -07:00
gibbed 4327724f77 Constant tests for divw, divwu. 2015-05-13 01:27:27 -05:00
Ben Vanik 398b37dc5f Fixing addze. 2015-05-12 23:26:21 -07:00
Ben Vanik 56bd2eee2e Fixing divdu by constant -1. 2015-05-12 23:09:32 -07:00
gibbed e7b03042ba Constant tests for addic, addme, addze, divd, divdu. 2015-05-13 01:01:12 -05:00
Ben Vanik 91c6ad8715 Fixing adde_constant. 2015-05-12 22:53:20 -07:00
gibbed dda6f3b6bd sldi is not srdi. 2015-05-13 00:35:35 -05:00
gibbed dc1b1ca638 Constant tests for add, addc, adde. 2015-05-13 00:21:57 -05:00
Ben Vanik f96dda4983 Adding xb-gpu-trace-viewer project. 2015-05-12 22:14:34 -07:00
Ben Vanik 7622746ecf 4A seems more legit for video mode unk. Still no clue what it is. 2015-05-12 21:41:44 -07:00
Ben Vanik a72dc93b92 'xb gentest' to generate test binaries on Windows. 2015-05-12 21:41:44 -07:00
gibbed c00ded9fbc Fixed VdQueryVideoFlags. 2015-05-12 22:59:21 -05:00
gibbed 95080cefa2 Fixed second argument in XamEnableInactivityProcessing. 2015-05-12 21:56:24 -05:00
Ben Vanik 5fbdd6e262 Fixing XMP playlist handles. 2015-05-12 19:55:10 -07:00
Ben Vanik cbdfd09e0f Fixing SHR constant prop and new cntlz tests. 2015-05-12 18:59:45 -07:00
Ben Vanik 48ae4b65fb Fixing CountLeadingZeros constant prop. 2015-05-12 18:51:01 -07:00
Ben Vanik acfb5b5722 fnabsx 2015-05-12 18:43:16 -07:00
Ben Vanik d9eca84d0b Formatting. 2015-05-12 18:17:34 -07:00
Dr. Chat 82eecb752b Fix 8bit and 16bit mul instructions and clean up some code 2015-05-12 13:35:13 -05:00
gibbed c5c312eb8f ColorFormat::k_16_16_FLOAT support, maybe. 2015-05-12 06:51:32 -05:00
gibbed ff2c00e220 Just in case. 2015-05-12 06:51:31 -05:00
gibbed fc9f9d9a60 This is probably more correct. Gets rid of all xobject related asserts for several games. 2015-05-12 06:51:30 -05:00
gibbed 19e733cff7 Added constant tests for cntlzd and cntlzw. 2015-05-12 01:20:26 -05:00
gibbed be1c60c74f Disabled lzcnt intrinsic usage for now. 2015-05-12 00:48:39 -05:00
gibbed 24b13b03f5 Fixing more cpu feature guards. 2015-05-12 00:26:45 -05:00
Ben Vanik 497e5a9f69 Fixing cpu feature guards. 2015-05-11 22:13:55 -07:00
Ben Vanik ad7efa964f Adding --enable_haswell_instructions=false to disable modern instructions. 2015-05-11 21:42:10 -07:00
Ben Vanik fc02a0c404 Switching up std::vector use in register allocator. 2015-05-11 21:01:48 -07:00
Ben Vanik 21edd65354 Fixing warnings and style. 2015-05-09 18:13:19 -07:00
Ben Vanik 5954d23438 Merge branch 'debug' 2015-05-09 18:01:40 -07:00
Ben Vanik 7a00b76a6e Debugger stuff, and changing to vcproj's/sln. 2015-05-09 17:48:12 -07:00
Dr. Chat 459024059a Setup UI menu code 2015-05-09 17:32:55 -05:00
Ben Vanik 4411a4499d XEX-style exports, dumping exports, and prepping kernel export lookup. 2015-05-09 00:59:03 -07:00
Ben Vanik 23eb343484 Calling DllMain, fixing ref count, and fixing module search. 2015-05-09 00:56:42 -07:00
Ben Vanik 0c646f4bc2 Prevent some stack overflows in MMIO handler. 2015-05-09 00:53:28 -07:00
Dr. Chat 0f2b1491b7 Call a DLL's entry-point function in XexLoadImage 2015-05-08 22:51:03 -05:00
Dr. Chat 8deb622abb Execute module entry-point function if it has one. 2015-05-08 22:50:54 -05:00
Ben Vanik 94c62b91d0 --trace_functions and --trace_function_coverage 2015-05-05 22:44:36 -07:00
Ben Vanik ade5388728 bool-ifying xe::cpu 2015-05-05 18:52:54 -07:00
Ben Vanik a38b05db24 Chunked mapped memory writer. 2015-05-05 18:52:53 -07:00
Ben Vanik 499bed21c0 Moving debugger. 2015-05-05 18:52:53 -07:00
Ben Vanik b07d5b8ed3 Fixing compile warnings. 2015-05-05 18:52:37 -07:00
Dr. Chat bffd2624fc Lookup XEX export by ordinal 2015-05-05 18:54:01 -05:00
Dr. Chat 2e9aec194f Ctrl+C Ctrl+V 2015-05-05 16:00:41 -05:00
Dr. Chat 26d8858684 Emulated vector shr 2015-05-05 15:58:51 -05:00
Rick Gibbed abf97ea44d Merge pull request #195 from DrChat/emulation
Emulate some vector arithmetic opcodes (until we get a native implementation)
2015-05-05 15:41:15 -05:00
Dr. Chat cb127ae9ba Emulate some vector arithmetic opcodes (until we get a native implementation) 2015-05-05 15:39:37 -05:00
Dr. Chat 54d84f04e3 XamLoaderLaunchTitle log parameters 2015-05-05 15:17:45 -05:00
Dr. Chat cff09a4509 OPCODE_VECTOR_SHA and SPLAT_I16 for non-AVX2 CPUs 2015-05-05 14:35:37 -05:00
gibbed 3249f84700 It's vpblendw. 2015-05-05 13:58:21 -05:00
gibbed 6694461698 Fixed ecx restore in EmitShlXX/EmitShrXX/EmitShaXX. 2015-05-05 13:58:03 -05:00
Ben Vanik 743e01209b Update x64_sequences.cc 2015-05-05 10:23:04 -07:00
Dr. Chat c3f1e74814 And actually use vpblendw 2015-05-05 12:16:38 -05:00
Dr. Chat c1f9952cbd PERMUTE_I32 Alternative instructions 2015-05-05 12:16:31 -05:00
Dr. Chat 0e836f2eec Fix CNTLZ (I think)
SAR alt. instruction
2015-05-05 08:53:41 -05:00
Ben Vanik 649eb1cf8e Merge pull request #190 from DrChat/load_module
XexLoadImage support for user modules
2015-05-04 20:32:12 -07:00
Ben Vanik 442e5f2840 clang-format 2015-05-04 20:24:02 -07:00
Ben Vanik 0f14575592 Shrinking debug info. 2015-05-04 20:24:02 -07:00
Dr. Chat 1b111f0313 Thread safety 2015-05-04 22:16:48 -05:00
Dr. Chat f12a8dbe20 Release modules on destruction 2015-05-04 22:07:58 -05:00
Dr. Chat 9f0663efa2 XexLoadImage for user modules 2015-05-04 22:03:14 -05:00
Dr. Chat d86674ed82 Whoops 2015-05-04 21:39:43 -05:00
Ben Vanik c4784e6dcd Merge pull request #187 from DrChat/upstream
XexGetProcedureAddress by proc name
2015-05-04 18:59:37 -07:00
Dr. Chat 9603a0a683 Formatting 2015-05-04 20:58:30 -05:00
Dr. Chat 1571c51a56 Kill some unused code 2015-05-04 20:33:04 -05:00
Dr. Chat e90475a31b kill the TODO 2015-05-04 20:26:18 -05:00
Dr. Chat bb398f32ca Guard test code with __try __except 2015-05-04 20:12:02 -05:00
Dr. Chat 6a602affed Don't parse loader export table for now (since it's referenced to with an exact address) 2015-05-04 18:16:31 -05:00
Dr. Chat 211cd0760a Use header->exe_address instead (in-case the module is relocated) 2015-05-04 18:11:39 -05:00
Dr. Chat be3d729831 Implemented this too (XexGetProcedureAddress) 2015-05-04 18:03:03 -05:00
Dr. Chat 49c8efdc6d XexGetProcedureAddress by name implemented. 2015-05-04 18:02:57 -05:00
Ben Vanik 78921c1a7e Merging Runtime into Processor. 2015-05-03 22:28:25 -07:00
Ben Vanik 4c8f3501ad Removing xdb and old tracing code before rewrite. 2015-05-03 22:01:31 -07:00
Ben Vanik d1ee1512b9 Fixing most clang-format errors. 2015-05-03 10:27:50 -07:00
Ben Vanik 6b22d35bfc Skeleton debugger. Here we go again! 2015-05-03 10:25:16 -07:00
Ben Vanik ce7270b839 Readme cleanup. 2015-05-02 11:07:40 -07:00
Ben Vanik d9e4bc98e1 Code cleanup: removing cxx_compat.h 2015-05-02 10:55:22 -07:00
Ben Vanik f8a2ed205e Merge pull request #185 from sephiroth99/remove_extra_headers
Remove cxx_compat.h header
2015-05-02 10:50:56 -07:00
Dr. Chat b87b7472e0 Fix splat w/ F32 2015-05-02 09:32:21 -05:00
Dr. Chat 850e80396f Whoops (again) 2015-05-02 09:32:13 -05:00
Dr. Chat 7844dfa034 Corrected vec splat alt. instructions 2015-05-02 09:32:03 -05:00
Dr. Chat b4025c889a whoops 2015-05-02 09:31:52 -05:00
Dr. Chat c464584e89 CNTLZ alternative instructions 2015-05-02 09:31:43 -05:00
Dr. Chat 414e5b2d30 Replaced some AVX2 instructions with non-AVX2 instructions if unsupported by CPU 2015-05-02 09:31:31 -05:00
Dr. Chat cad6ca6148 Include host CPU information in x64 emitter
Conflicts:
	src/xenia/cpu/backend/x64/x64_emitter.cc
2015-05-02 09:31:01 -05:00
sephiroth99 fbb3878cf4 Remove cxx_compat.h header
Revert commits 6d159dc2 and 3f480d24. Visual Studio 2013 is not
supported anymore, so they are not needed.
2015-05-02 09:36:34 -04:00
Ben Vanik e3220f7ae6 Code cleanup: moving poly/ into xenia/base/ 2015-05-02 03:42:51 -07:00
Ben Vanik 99816056be Code cleanup: removing poly.h 2015-05-02 02:29:26 -07:00
Ben Vanik 642259e16f Code cleanup: moving ExportResolver to xe::cpu 2015-05-02 02:11:11 -07:00
Ben Vanik d76998915a Code cleanup: moving poly logging to xenia 2015-05-02 01:59:50 -07:00
Ben Vanik f7ca026db0 Code cleanup: moving poly::ui to xe::ui 2015-05-02 01:50:19 -07:00
Ben Vanik 4d15b2296e Code cleanup: removing config.h and cleaning up platform.h 2015-05-02 01:41:39 -07:00
Ben Vanik 30f7effa73 Code cleanup: removing common.h 2015-05-02 01:25:59 -07:00
Ben Vanik 727ffaa122 Various fixes and utilties. 2015-05-02 00:26:03 -07:00
Ben Vanik 98e7e2727b Updating deps. 2015-05-01 18:53:39 -07:00
Ben Vanik 6d8a226d7f Code cleanup. 2015-03-29 11:27:33 -07:00
Ben Vanik 45b2d2ceea Fixing xaudio2 memory type. 2015-03-29 11:26:16 -07:00
Ben Vanik ec84a688e9 Starting to properly attribute virtual vs. physical memory accesses. 2015-03-29 11:11:35 -07:00
Ben Vanik ab90e0932b Minor tweaks for crazy shaders. 2015-03-28 18:13:21 -07:00
Ben Vanik 3a197705bb Special memory functions for system allocs. 2015-03-28 15:54:44 -07:00
Ben Vanik 71eabf7f2b Fixing some misc bugs. 2015-03-28 15:45:39 -07:00
Ben Vanik 6bf84d832f fresx and some vec128 constant prop. 2015-03-25 19:17:16 -07:00
Ben Vanik 40591a5376 Fixing builtins. 2015-03-24 20:00:51 -07:00
Ben Vanik 281abea955 Converting addresses in xe::cpu to 32bit. 2015-03-24 19:41:29 -07:00
Ben Vanik 3279776a80 Moving cpu/frontend/ppc/ to cpu/frontend/. 2015-03-24 08:37:00 -07:00
Ben Vanik 9281d62106 Moving cpu/runtime/ to cpu/. 2015-03-24 08:25:58 -07:00
Ben Vanik 29912f44c0 Moving alloy/ into xenia/cpu/ to start simplifying things. 2015-03-24 07:46:18 -07:00
Ben Vanik 59395318f3 Moving some util types into poly. 2015-03-22 22:12:37 -07:00
Ben Vanik b392afbfae Basic cubemap support, though the sampling code is wrong. 2015-03-22 19:15:22 -07:00
Ben Vanik 7677d6ea9f Depth range. 2015-03-22 15:30:36 -07:00
Ben Vanik 8cfcea2309 32_32_F render target format. 2015-03-22 15:30:18 -07:00
Ben Vanik 6486299496 --flush_stdout to disable flushing. 2015-03-22 11:49:13 -07:00
Ben Vanik f8db3774cb Hiding draw batch flush scope. 2015-03-22 11:41:46 -07:00
Ben Vanik 11b0c076bd Adding basic short-term vb reuse, removing index counting.
Regression for some games (that don't size their fetches), massive
improvement for others.
2015-03-22 11:35:23 -07:00
Ben Vanik 159ebb4295 Removing unneeded stencil register logic. 2015-03-22 09:37:55 -07:00
Ben Vanik 08e652410e Plumbing scalar params through swap. Hacky, but works for replay. 2015-03-22 09:31:55 -07:00
Ben Vanik cef9a684cd Primitive reset. 2015-03-22 08:52:05 -07:00
Ben Vanik 559cda3215 Forcing depth clear - not right, but gets atrain working. 2015-03-22 01:07:14 -07:00
Ben Vanik b75e070d1b Fixing color/depth clear state. 2015-03-22 00:45:00 -07:00
Ben Vanik c8ddc48106 Fixing microprofile display. 2015-03-21 23:00:15 -07:00
Ben Vanik 2401bb7d03 Fixing 1px offset in tiles. 2015-03-21 22:52:35 -07:00
Ben Vanik fa58eaa317 Partial success on predicated tiling (depth buffer still bad). 2015-03-21 22:32:23 -07:00
Ben Vanik 7c3225ee41 Render target display in trace viewer. 2015-03-21 10:41:20 -07:00
Ben Vanik 494e918496 Fixing alpha testing. 2015-03-21 03:21:55 -07:00
Ben Vanik 704077d543 Removing unneeded glViewport. 2015-03-21 02:38:52 -07:00
Ben Vanik b406f49ae4 Extracting dest coords in copies; still not right. 2015-03-21 02:11:23 -07:00
Ben Vanik fe7de2c0ba Window offset goes here. Still broken due to copy issue. 2015-03-20 22:26:20 -07:00
Ben Vanik 6b7b57cecf Super basic vertex buffer display in trace viewer. 2015-03-20 21:54:52 -07:00
Ben Vanik 8ce30448f8 Index buffer display in trace viewer. 2015-03-20 20:41:58 -07:00
Ben Vanik f7d0c427be Implementing alpha testing. 2015-03-20 20:12:27 -07:00
Ben Vanik a82587f943 Fixing window offset and moving into state batch params. 2015-03-20 17:41:50 -07:00
Ben Vanik d695f637a8 int draw offsets. 2015-03-20 16:47:31 -07:00
Ben Vanik 92f1a7cb40 Show predication in trace viewer (colors not accurate yet). 2015-03-20 16:38:26 -07:00
Ben Vanik 22246cccb5 Whoops - my arbitrarily picked GPU command # collided -_- 2015-03-20 16:37:04 -07:00
Ben Vanik 0ea8f74cf8 Packet disassembler just for current command. 2015-03-15 21:22:23 -07:00
Ben Vanik b060f6f263 disasm set shader consts packet. 2015-03-15 20:59:21 -07:00
Ben Vanik 2157c8a2b2 Dropping a bunch of profiling - VB/IB upload is slow, that's about it. 2015-03-15 20:32:40 -07:00
Ben Vanik 1608878437 Trying to figure out shader flow control; not going so well :/ 2015-03-15 16:55:20 -07:00
Ben Vanik 35513ceea0 Constant slot pairing... maybe. 2015-03-15 14:21:09 -07:00
Ben Vanik 341a493bf9 Discovered new GPU opcode for constant setting. 2015-03-15 12:26:40 -07:00
Ben Vanik 4d61bac00f Assert shader constant bases. 2015-03-15 11:34:33 -07:00
Ben Vanik d803612184 Fixing recording of LOAD_ALU_CONSTANT. 2015-03-15 11:27:04 -07:00
Ben Vanik 795df80687 Possibly right const addressing and more shader instructions. 2015-03-15 11:20:19 -07:00
Ben Vanik b07cd49281 Fiddling with msaa scaling. 2015-03-15 02:28:39 -07:00
Ben Vanik 86faacdb87 LOAD_ALU_CONSTANT also taking a target type. 2015-03-15 02:05:26 -07:00
Ben Vanik 64c8d7ab98 MRTs and some more texture formats. 2015-03-15 02:05:01 -07:00
Ben Vanik b818adbf6d SET_CONSTANT for the other types. I think. 2015-03-15 01:18:00 -07:00
Ben Vanik 1a9ce6edfa Somewhere the file access mode is messed up... 2015-03-15 00:18:18 -07:00
Ben Vanik 613fdac71d Implementing one case of conditional shader execution blocks. 2015-03-14 23:55:33 -07:00
Ben Vanik ff4e9c32b6 XamContentFlush stub. 2015-03-14 23:54:52 -07:00
Ben Vanik 0117c39968 Proper XamEnumerate return when there are zero items. 2015-03-14 23:54:43 -07:00
Ben Vanik c6c24d50bd Extra copy dest formats. 2015-03-14 20:27:34 -07:00
Ben Vanik 1358d54ce9 Not sure msaa scaling is required anymore - odd. 2015-03-14 20:08:25 -07:00
Ben Vanik a70533f1c5 Fast seek forward in trace viewer. 2015-03-14 20:08:05 -07:00
Ben Vanik 55556e774f vs export mode 2 is ok. 2015-03-14 20:07:55 -07:00
Ben Vanik 6f0ca00651 Screen extent write; doesn't seem to do anything :/ 2015-03-14 16:50:54 -07:00
Ben Vanik 7192728fe0 Playing more with viewport stuff. 2015-03-14 16:11:55 -07:00
Ben Vanik d57306b473 Possibly fixing transforms. 2015-03-10 20:25:14 -07:00
Ben Vanik 5c33925995 Massive reworking of shader translator; for ALU ops only. 2015-03-08 22:08:53 -07:00
Ben Vanik 98194f0482 Assert on failure to compile glsl and unimplemented shader instrs. 2015-03-08 21:57:44 -07:00
Ben Vanik c28cbba00c Bigger textures in trace viewer. 2015-03-08 21:57:04 -07:00
Ben Vanik b9f9e1bb2b Blitter handles color/depth texture copies. 2015-03-07 16:12:52 -08:00
Ben Vanik d72610ba1b Custom blitter for final resolve. 2015-03-07 10:17:09 -08:00
Ben Vanik 2bce5ba0d9 Skip all predicated swaps - this may be too aggressive. 2015-03-06 22:40:42 -08:00
Ben Vanik 05239daecf Fixing tracing of games that do everything in nested indirect buffers. 2015-03-06 22:27:41 -08:00
Ben Vanik 14c6fbfba4 Adding safety checks, disabling vendor gl extensions by default. 2015-03-06 21:54:59 -08:00
Ben Vanik 84fa131f12 Hacking on render targets. Kind of work in simple cases, upside down :/ 2015-03-06 20:36:10 -08:00
Ben Vanik a1e68c0036 Experimenting with clip mode but it doesn't work like I think it does. 2015-03-06 19:27:45 -08:00
Ben Vanik 9db38ac860 Kind of fixing window coordinates. 2015-03-06 13:42:56 -08:00
Ben Vanik 05bdbbbe84 Fixing packet disassembler. 2015-03-06 12:24:46 -08:00
Ben Vanik b19c98fd9a Fixing small textures. This was painful.
Fixes #173.
2015-03-05 22:22:34 -08:00
Ben Vanik 4b5f77bde4 Special quad list line geometry shader.
Fixes #174.
2015-03-03 20:31:05 -08:00
Ben Vanik 41174b0e64 Hacktastic GPU trace viewer; textures, shaders, state, etc. 2015-03-01 12:26:11 -08:00
Ben Vanik 0f1e870d99 Fixing keyboard input in imgui. 2015-02-21 11:47:53 -08:00
Ben Vanik f013fde7b6 Merge pull request #172 from x1nixmzeng/master
Added API scanner tool
2015-02-21 11:46:41 -08:00
Ben Vanik 07c592942f Simple UI for frame seeking. 2015-02-21 11:19:00 -08:00
Ben Vanik 5227fe72b5 RequestSwap to force a swap from the GL thread. 2015-02-21 11:18:22 -08:00
x1nixmzeng 25f78ed325 Added API scanner tool
New tool for issue #171 which links to libxenia to dump the API usage
from packaged content
2015-02-21 17:33:56 +00:00
Ben Vanik 130c11a2ca GPU recording (--trace_gpu=file) and playback (gpu-trace-viewer file). 2015-02-20 07:47:06 -08:00
Ben Vanik c4aeedd0a3 Hacking in PACK 8_IN_16 UUS 2015-02-17 17:23:19 -08:00
x1nixmzeng d091f12c81 Adjustments to wildcard engine
Fixed incorrect logic when checking at the end of the string - some of
the names had an added null character
Removed case sensitivity
2015-02-17 22:42:01 +00:00
Ben Vanik 17bc561045 Implement XMA* methods.
Fixes #156.
2015-02-16 22:22:42 -08:00
Ben Vanik 1204f35f1e --disable_framebuffer_readback 2015-02-16 21:58:24 -08:00
Ben Vanik 50b0746a26 XMA hardware spoofing when using direct register access.
This works for recent games that don't use the XMA* methods.
Upcoming CLs will add the XMA* method shims forthcoming.
2015-02-16 17:18:28 -08:00
x1nixmzeng 97ed221d8b Fixed writing data to the host device
New paths can now be created if they do not exist - this allows content
packages such as savedata to be written to disk
2015-02-16 23:04:10 +00:00
Ben Vanik 20f40a1da4 sprintf. 2015-02-16 10:07:46 -08:00
Ben Vanik 04b30fef99 Fixing warning. 2015-02-13 15:50:37 -08:00