Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
S
Suyu
Manage
Activity
Members
Labels
Plan
Issues
0
Issue boards
Milestones
Wiki
Code
Merge requests
0
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Package Registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Terms and privacy
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
many-archive
Suyu
Commits
e36f1a5b
There was an error fetching the commit references. Please try again later.
Commit
e36f1a5b
authored
5 years ago
by
Lioncash
Browse files
Options
Downloads
Patches
Plain Diff
video_core/gpu: Amend typo in GPU member variable name
smaphore -> semaphore
parent
47f2405a
No related branches found
No related tags found
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
src/video_core/gpu.cpp
+5
-4
5 additions, 4 deletions
src/video_core/gpu.cpp
src/video_core/gpu.h
+3
-3
3 additions, 3 deletions
src/video_core/gpu.h
with
8 additions
and
7 deletions
src/video_core/gpu.cpp
+
5
−
4
View file @
e36f1a5b
...
...
@@ -286,9 +286,10 @@ void GPU::ProcessSemaphoreTriggerMethod() {
// TODO(Kmather73): Generate a real GPU timestamp and write it here instead of
// CoreTiming
block
.
timestamp
=
Core
::
System
::
GetInstance
().
CoreTiming
().
GetTicks
();
memory_manager
->
WriteBlock
(
regs
.
smaphore_address
.
SmaphoreAddress
(),
&
block
,
sizeof
(
block
));
memory_manager
->
WriteBlock
(
regs
.
semaphore_address
.
SemaphoreAddress
(),
&
block
,
sizeof
(
block
));
}
else
{
const
u32
word
{
memory_manager
->
Read
<
u32
>
(
regs
.
smaphore_address
.
SmaphoreAddress
())};
const
u32
word
{
memory_manager
->
Read
<
u32
>
(
regs
.
s
e
maphore_address
.
S
e
maphoreAddress
())};
if
((
op
==
GpuSemaphoreOperation
::
AcquireEqual
&&
word
==
regs
.
semaphore_sequence
)
||
(
op
==
GpuSemaphoreOperation
::
AcquireGequal
&&
static_cast
<
s32
>
(
word
-
regs
.
semaphore_sequence
)
>
0
)
||
...
...
@@ -315,11 +316,11 @@ void GPU::ProcessSemaphoreTriggerMethod() {
}
void
GPU
::
ProcessSemaphoreRelease
()
{
memory_manager
->
Write
<
u32
>
(
regs
.
smaphore_address
.
SmaphoreAddress
(),
regs
.
semaphore_release
);
memory_manager
->
Write
<
u32
>
(
regs
.
s
e
maphore_address
.
S
e
maphoreAddress
(),
regs
.
semaphore_release
);
}
void
GPU
::
ProcessSemaphoreAcquire
()
{
const
u32
word
=
memory_manager
->
Read
<
u32
>
(
regs
.
smaphore_address
.
SmaphoreAddress
());
const
u32
word
=
memory_manager
->
Read
<
u32
>
(
regs
.
s
e
maphore_address
.
S
e
maphoreAddress
());
const
auto
value
=
regs
.
semaphore_acquire
;
if
(
word
!=
value
)
{
regs
.
acquire_active
=
true
;
...
...
This diff is collapsed.
Click to expand it.
src/video_core/gpu.h
+
3
−
3
View file @
e36f1a5b
...
...
@@ -177,11 +177,11 @@ public:
u32
address_high
;
u32
address_low
;
GPUVAddr
SmaphoreAddress
()
const
{
GPUVAddr
S
e
maphoreAddress
()
const
{
return
static_cast
<
GPUVAddr
>
((
static_cast
<
GPUVAddr
>
(
address_high
)
<<
32
)
|
address_low
);
}
}
smaphore_address
;
}
s
e
maphore_address
;
u32
semaphore_sequence
;
u32
semaphore_trigger
;
...
...
@@ -263,7 +263,7 @@ private:
static_assert(offsetof(GPU::Regs, field_name) == position * 4, \
"Field " #field_name " has invalid position")
ASSERT_REG_POSITION
(
smaphore_address
,
0x4
);
ASSERT_REG_POSITION
(
s
e
maphore_address
,
0x4
);
ASSERT_REG_POSITION
(
semaphore_sequence
,
0x6
);
ASSERT_REG_POSITION
(
semaphore_trigger
,
0x7
);
ASSERT_REG_POSITION
(
reference_count
,
0x14
);
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment